Remember to delete un-expandable variables, and do a better job of expanding

[oweals/busybox.git] / rdate.c

diff --git a/rdate.c b/rdate.c
index d350be87724b0e46d39a368ad018669f7fec4056..a3ea3a85bf3204f8a8d35e810b12b1a0ce92d105 100644 (file)
--- a/rdate.c
+++ b/rdate.c
@@ -21,9 +21,6 @@
  *
 */
 
-#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#include "messages.c"
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -33,6 +30,9 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "busybox.h"
+#define BB_DECLARE_EXTERN
+#include "messages.c"
 
 
 static const int RFC_868_BIAS = 2208988800UL;
@@ -95,14 +95,14 @@ int rdate_main(int argc, char **argv)
        /* Interpret command line args */
        /* do special-case option parsing */
        if (argv[1] && (strcmp(argv[1], "--help") == 0))
-               usage(rdate_usage);
+               show_usage();
 
        /* do normal option parsing */
        while ((opt = getopt(argc, argv, "Hsp")) > 0) {
                switch (opt) {
                        default:
                        case 'H':
-                               usage(rdate_usage);
+                               show_usage();
                                break;
                        case 's':
                                setdate++;
@@ -117,7 +117,7 @@ int rdate_main(int argc, char **argv)
        if (printdate==0 && setdate==0) setdate++;
 
        if (optind == argc) {
-               usage(rdate_usage);
+               show_usage();
        }
 
        if ((time= askremotedate(argv[optind])) == (time_t)-1) {