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 7c8d54117efe2667a7e5657d778f143386dfad76..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>
@@ -31,9 +28,14 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <getopt.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
+#define BB_DECLARE_EXTERN
+#include "messages.c"
 
 
-#define RFC_868_BIAS   2208988800UL
+static const int RFC_868_BIAS = 2208988800UL;
 
 int setdate= 0;
 int printdate= 0;
@@ -47,15 +49,15 @@ time_t askremotedate(char *host)
        int fd;
 
        if (!(h = gethostbyname(host))) {       /* get the IP addr */
-               errorMsg("%s: %s\n", host, strerror(errno));
+               perror_msg("%s", host);
                return(-1);
        }
        if ((tserv = getservbyname("time", "tcp")) == NULL) { /* find port # */
-               errorMsg("%s: %s\n", "time", strerror(errno));
+               perror_msg("%s", "time");
                return(-1);
        }
        if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {  /* get net connection */
-               errorMsg("%s: %s\n", "socket", strerror(errno));
+               perror_msg("%s", "socket");
                return(-1);
        }
 
@@ -64,13 +66,13 @@ time_t askremotedate(char *host)
        sin.sin_family = AF_INET;
 
        if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {    /* connect to time server */
-               errorMsg("%s: %s\n", host, strerror(errno));
+               perror_msg("%s", host);
                close(fd);
                return(-1);
        }
        if (read(fd, (void *)&nett, 4) != 4) {  /* read time from server */
                close(fd);
-               errorMsg("%s did not send the complete time\n", host);
+               error_msg("%s did not send the complete time", host);
        }
        close(fd);
 
@@ -93,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++;
@@ -115,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) {
@@ -123,10 +125,10 @@ int rdate_main(int argc, char **argv)
        }
        if (setdate) {
                if (stime(&time) < 0)
-                       fatalError("Could not set time of day: %s\n", strerror(errno));
+                       perror_msg_and_die("Could not set time of day");
        }
        if (printdate) {
-               fprintf(stdout, "%s", ctime(&time));
+               printf("%s", ctime(&time));
        }
 
        return EXIT_SUCCESS;