Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/cal.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/cal.c (modified) (5 diffs)

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

@@ -17 +17 @@
  * Major size reduction... over 50% (>1.5k) on i386.
  */
+
+//usage:#define cal_trivial_usage
+//usage:       "[-jy] [[MONTH] YEAR]"
+//usage:#define cal_full_usage "\n\n"
+//usage:       "Display a calendar\n"
+//usage:     "\n    -j  Use julian dates"
+//usage:     "\n    -y  Display the entire year"
+
 #include "libbb.h"
 #include "unicode.h"
@@ -36 +44 @@
 
 static const unsigned char sep1752[] ALIGN1 = {
-         1, 2,  14, 15, 16,
+        1,  2,  14, 15, 16,
     17, 18, 19, 20, 21, 22, 23,
     24, 25, 26, 27, 28, 29, 30
@@ -139 +147 @@
                 *hp++ = ' ';
             {
-                char *two_wchars = unicode_conv_to_printable_fixedwidth(NULL, buf, 2);
+                char *two_wchars = unicode_conv_to_printable_fixedwidth(/*NULL,*/ buf, 2);
                 strcpy(hp, two_wchars);
                 free(two_wchars);
@@ -160 +168 @@
         len = sprintf(lineout, "%s %d", month_names[month - 1], year);
         printf("%*s%s\n%s\n",
-               ((7*julian + WEEK_LEN) - len) / 2, "",
-               lineout, day_headings);
+                ((7*julian + WEEK_LEN) - len) / 2, "",
+                lineout, day_headings);
         for (row = 0; row < 6; row++) {
             build_row(lineout, dp)[0] = '\0';
@@ -174 +182 @@
         sprintf(lineout, "%u", year);
         center(lineout,
-               (WEEK_LEN * 3 + HEAD_SEP * 2)
-               + julian * (J_WEEK_LEN * 2 + HEAD_SEP
-                           - (WEEK_LEN * 3 + HEAD_SEP * 2)),
-               0);
+                (WEEK_LEN * 3 + HEAD_SEP * 2)
+                + julian * (J_WEEK_LEN * 2 + HEAD_SEP
+                        - (WEEK_LEN * 3 + HEAD_SEP * 2)),
+                0
+        );
         puts("\n");     /* two \n's */
         for (i = 0; i < 12; i++) {