typo fix in a comment in a testcase. oh well...

[oweals/busybox.git] / coreutils / cal.c

diff --git a/coreutils/cal.c b/coreutils/cal.c
index 3116e1ebe74996d68876deabcd0b325b947a33f3..9b597772ec2404bd399da05442780fc9a13e3465 100644 (file)
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -40,7 +40,8 @@ static const unsigned char sep1752[] ALIGN1 = {
        24,     25,     26,     27,     28,     29,     30
 };
 
-static unsigned julian;
+/* Set to 0 or 1 in main */
+#define julian ((unsigned)option_mask32)
 
 /* leap year -- account for Gregorian reformation in 1752 */
 static int leap_year(unsigned yr)
@@ -75,7 +76,7 @@ static char *build_row(char *p, unsigned *dp);
 #define        J_WEEK_LEN      (WEEK_LEN + 7)
 #define        HEAD_SEP        2               /* spaces between day headings */
 
-int cal_main(int argc, char **argv);
+int cal_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cal_main(int argc, char **argv)
 {
        struct tm *local_time;
@@ -87,7 +88,8 @@ int cal_main(int argc, char **argv)
        char buf[40];
 
        flags = getopt32(argv, "jy");
-       julian = flags & 1;
+       /* This sets julian = flags & 1: */
+       option_mask32 &= 1;
        month = 0;
        argv += optind;
        argc -= optind;
@@ -100,7 +102,7 @@ int cal_main(int argc, char **argv)
                time(&now);
                local_time = localtime(&now);
                year = local_time->tm_year + 1900;
-               if (!(flags & 2)) {
+               if (!(flags & 2)) { /* no -y */
                        month = local_time->tm_mon + 1;
                }
        } else {
@@ -179,7 +181,7 @@ int cal_main(int argc, char **argv)
                }
        }
 
-       fflush_stdout_and_exit(0);
+       fflush_stdout_and_exit(EXIT_SUCCESS);
 }
 
 /*