Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/cal.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/cal.c (modified) (23 diffs)

branches/2.2.5/mindi-busybox/coreutils/cal.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Calendar implementation for busybox
@@ -4 +5 @@
  * See original copyright at the end of this file
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
-*/
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
 
 /* BB_AUDIT SUSv3 compliant with -j and -y extensions (from util-linux). */
@@ -30 +18 @@
  */
 
-#include <sys/types.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "busybox.h"
-
-#ifdef CONFIG_LOCALE_SUPPORT
-#include <locale.h>
-#endif
+#include "libbb.h"
+
+/* We often use "unsigned" intead of "int", it's easier to div on most CPUs */
 
 #define THURSDAY        4       /* for reformation */
@@ -53 +31 @@
 #define SPACE           -1      /* used in day array */
 
-static const char days_in_month[] = {
+static const unsigned char days_in_month[] ALIGN1 = {
     0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
 
-static const char sep1752[] = {
-             1, 2,  14, 15, 16,
+static const unsigned char sep1752[] ALIGN1 = {
+         1, 2,  14, 15, 16,
     17, 18, 19, 20, 21, 22, 23,
     24, 25, 26, 27, 28, 29, 30
 };
 
-static int julian;
+static unsigned julian;
 
 /* leap year -- account for Gregorian reformation in 1752 */
-#define leap_year(yr) \
-    ((yr) <= 1752 ? !((yr) % 4) : \
-    (!((yr) % 4) && ((yr) % 100)) || !((yr) % 400))
-
-static int is_leap_year(int year)
-{
-    return leap_year(year);
-}
-#undef leap_year
-#define leap_year(yr) is_leap_year(yr)
+static int leap_year(unsigned yr)
+{
+    if (yr <= 1752)
+        return !(yr % 4);
+    return (!(yr % 4) && (yr % 100)) || !(yr % 400);
+}
 
 /* number of centuries since 1700, not inclusive */
@@ -89 +63 @@
     ((yr) / 4 - centuries_since_1700(yr) + quad_centuries_since_1700(yr))
 
-static void center (char *, int, int);
-static void day_array (int, int, int *);
-static void trim_trailing_spaces_and_print (char *);
+static void center(char *, unsigned, unsigned);
+static void day_array(unsigned, unsigned, unsigned *);
+static void trim_trailing_spaces_and_print(char *);
 
 static void blank_string(char *buf, size_t buflen);
-static char *build_row(char *p, int *dp);
+static char *build_row(char *p, unsigned *dp);
 
 #define DAY_LEN     3       /* 3 spaces per day */
@@ -102 +76 @@
 #define HEAD_SEP    2       /* spaces between day headings */
 
+int cal_main(int argc, char **argv);
 int cal_main(int argc, char **argv)
 {
@@ -107 +82 @@
     struct tm zero_tm;
     time_t now;
-    int month, year, flags, i;
+    unsigned month, year, flags, i;
     char *month_names[12];
     char day_headings[28];  /* 28 for julian, 21 for nonjulian */
     char buf[40];
 
-#ifdef CONFIG_LOCALE_SUPPORT
-    setlocale(LC_TIME, "");
-#endif
-
-    flags = bb_getopt_ulflags(argc, argv, "jy");
-
+    flags = getopt32(argv, "jy");
     julian = flags & 1;
-
+    month = 0;
     argv += optind;
-
-    month = 0;
-
-    if ((argc -= optind) > 2) {
+    argc -= optind;
+
+    if (argc > 2) {
         bb_show_usage();
     }
@@ -137 +106 @@
     } else {
         if (argc == 2) {
-            month = bb_xgetularg10_bnd(*argv++, 1, 12);
-        }
-        year = bb_xgetularg10_bnd(*argv, 1, 9999);
-    }
-
-    blank_string(day_headings, sizeof(day_headings) - 7 +  7*julian);
+            month = xatou_range(*argv++, 1, 12);
+        }
+        year = xatou_range(*argv, 1, 9999);
+    }
+
+    blank_string(day_headings, sizeof(day_headings) - 7 + 7*julian);
 
     i = 0;
@@ -148 +117 @@
         zero_tm.tm_mon = i;
         strftime(buf, sizeof(buf), "%B", &zero_tm);
-        month_names[i] = bb_xstrdup(buf);
+        month_names[i] = xstrdup(buf);
 
         if (i < 7) {
@@ -158 +127 @@
 
     if (month) {
-        int row, len, days[MAXDAYS];
-        int *dp = days;
+        unsigned row, len, days[MAXDAYS];
+        unsigned *dp = days;
         char lineout[30];
 
         day_array(month, year, dp);
         len = sprintf(lineout, "%s %d", month_names[month - 1], year);
-        bb_printf("%*s%s\n%s\n",
+        printf("%*s%s\n%s\n",
                ((7*julian + WEEK_LEN) - len) / 2, "",
                lineout, day_headings);
@@ -173 +142 @@
         }
     } else {
-        int row, which_cal, week_len, days[12][MAXDAYS];
-        int *dp;
+        unsigned row, which_cal, week_len, days[12][MAXDAYS];
+        unsigned *dp;
         char lineout[80];
 
@@ -195 +164 @@
             }
             center(month_names[month + 2 - julian], week_len, 0);
-            bb_printf("\n%s%*s%s", day_headings, HEAD_SEP, "", day_headings);
+            printf("\n%s%*s%s", day_headings, HEAD_SEP, "", day_headings);
             if (!julian) {
-                bb_printf("%*s%s", HEAD_SEP, "", day_headings);
+                printf("%*s%s", HEAD_SEP, "", day_headings);
             }
             putchar('\n');
@@ -211 +180 @@
     }
 
-    bb_fflush_stdout_and_exit(0);
+    fflush_stdout_and_exit(0);
 }
 
@@ -221 +190 @@
  *  builds that array for any month from Jan. 1 through Dec. 9999.
  */
-static void day_array(int month, int year, int *days)
-{
-    long temp;
-    int i;
-    int j_offset;
-    int day, dw, dm;
+static void day_array(unsigned month, unsigned year, unsigned *days)
+{
+    unsigned long temp;
+    unsigned i;
+    unsigned day, dw, dm;
 
     memset(days, SPACE, MAXDAYS * sizeof(int));
 
     if ((month == 9) && (year == 1752)) {
+        /* Assumes the Gregorian reformation eliminates
+         * 3 Sep. 1752 through 13 Sep. 1752.
+         */
+        unsigned j_offset = julian * 244;
         size_t oday = 0;
-        
-        j_offset = julian * 244;
+
         do {
             days[oday+2] = sep1752[oday] + j_offset;
@@ -242 +213 @@
 
     /* day_in_year
-     *  return the 1 based day number within the year
+     * return the 1 based day number within the year
      */
     day = 1;
@@ -255 +226 @@
 
     /* day_in_week
-     *  return the 0 based day number for any date from 1 Jan. 1 to
-     *  31 Dec. 9999.  Assumes the Gregorian reformation eliminates
-     *  3 Sep. 1752 through 13 Sep. 1752.  Returns Thursday for all
-     *  missing days.
+     * return the 0 based day number for any date from 1 Jan. 1 to
+     * 31 Dec. 9999.  Assumes the Gregorian reformation eliminates
+     * 3 Sep. 1752 through 13 Sep. 1752.  Returns Thursday for all
+     * missing days.
      */
-    dw = THURSDAY;
-    temp = (long)(year - 1) * 365 + leap_years_since_year_1(year - 1)
-        + day;
+    temp = (long)(year - 1) * 365 + leap_years_since_year_1(year - 1) + day;
     if (temp < FIRST_MISSING_DAY) {
         dw = ((temp - 1 + SATURDAY) % 7);
-    } else if (temp >= (FIRST_MISSING_DAY + NUMBER_MISSING_DAYS)) {
+    } else {
         dw = (((temp - 1 + SATURDAY) - NUMBER_MISSING_DAYS) % 7);
     }
@@ -278 +247 @@
     }
 
-    while (dm) {
+    do {
         days[dw++] = day++;
-        --dm;
-    }
+    } while (--dm);
 }
 
@@ -291 +259 @@
         ++p;
     }
-    while (p > s) {
+    while (p != s) {
         --p;
         if (!(isspace)(*p)) {   /* We want the function... not the inline. */
@@ -302 +270 @@
 }
 
-static void center(char *str, int len, int separate)
-{
-    int n = strlen(str);
+static void center(char *str, unsigned len, unsigned separate)
+{
+    unsigned n = strlen(str);
     len -= n;
-    bb_printf("%*s%*s", (len/2) + n, str, (len/2) + (len % 2) + separate, "");
+    printf("%*s%*s", (len/2) + n, str, (len/2) + (len % 2) + separate, "");
 }
 
@@ -315 +283 @@
 }
 
-static char *build_row(char *p, int *dp)
-{
-    int col, val, day;
+static char *build_row(char *p, unsigned *dp)
+{
+    unsigned col, val, day;
 
     memset(p, ' ', (julian + DAY_LEN) * 7);
@@ -323 +291 @@
     col = 0;
     do {
-        if ((day = *dp++) != SPACE) {
+        day = *dp++;
+        if (day != SPACE) {
             if (julian) {
                 ++p;
@@ -332 +301 @@
                 }
             }
-            if ((val = day / 10) > 0) {
+            val = day / 10;
+            if (val > 0) {
                 *p = val + '0';
             }
@@ -376 +346 @@
  * SUCH DAMAGE.
  */
-
-