- add libbb function str_tolower to convert a string to lowercase.

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

diff --git a/coreutils/date.c b/coreutils/date.c
index 034a18b9825f7c8ac489e91735ee6288fb233295..d2d77f413fc0d9b32b6ac1a725998fa17c1d2085 100644 (file)
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -44,6 +44,7 @@ static void maybe_set_utc(int opt)
                xputenv((char*)"TZ=UTC0");
 }
 
+int date_main(int argc, char **argv);
 int date_main(int argc, char **argv)
 {
        time_t tm;
@@ -68,15 +69,15 @@ int date_main(int argc, char **argv)
                if (!isofmt_arg) {
                        ifmt = 0; /* default is date */
                } else {
-                       const char * const isoformats[] =
-                               {"date", "hours", "minutes", "seconds"};
+                       static const char * const isoformats[] =
+                               { "date", "hours", "minutes", "seconds" };
 
                        for (ifmt = 0; ifmt < 4; ifmt++)
-                               if (!strcmp(isofmt_arg, isoformats[ifmt])) {
-                                       break;
-                               }
-                       if (ifmt == 4) /* parse error */
-                               bb_show_usage();
+                               if (!strcmp(isofmt_arg, isoformats[ifmt]))
+                                       goto found;
+                       /* parse error */
+                       bb_show_usage();
+ found: ;
                }
        }
 
@@ -206,7 +207,7 @@ int date_main(int argc, char **argv)
                                        date_fmt[i++] = '%';
                                        date_fmt[i++] = 'S';
                                }
-format_utc:
+ format_utc:
                                date_fmt[i++] = '%';
                                date_fmt[i] = (opt & DATE_OPT_UTC) ? 'Z' : 'z';
                        }