This depmod script will create a modules.dep file, just like the depmod

[oweals/busybox.git] / rdate.c

diff --git a/rdate.c b/rdate.c
index 87edecbfca0a35b8a03c334a50fbc7f732112ad0..50be4de8c2cee0f076a40ba430fcf4c38acdf841 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,47 +28,41 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <getopt.h>
+#include <string.h>
+#include <time.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 
 
-#define RFC_868_BIAS   2208988800UL
-
-int setdate= 0;
-int printdate= 0;
+static const int RFC_868_BIAS = 2208988800UL;
 
-time_t askremotedate(char *host)
+static time_t askremotedate(const char *host)
 {
        struct hostent *h;
-       struct sockaddr_in sin;
+       struct sockaddr_in s_in;
        struct servent *tserv;
        unsigned long int nett, localt;
        int fd;
 
-       if (!(h = gethostbyname(host))) {       /* get the IP addr */
-               error_msg("%s: %s\n", host, strerror(errno));
-               return(-1);
-       }
-       if ((tserv = getservbyname("time", "tcp")) == NULL) { /* find port # */
-               error_msg("%s: %s\n", "time", strerror(errno));
-               return(-1);
-       }
-       if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {  /* get net connection */
-               error_msg("%s: %s\n", "socket", strerror(errno));
-               return(-1);
-       }
+       h = xgethostbyname(host);         /* get the IP addr */
 
-       memcpy(&sin.sin_addr, h->h_addr, sizeof(sin.sin_addr));
-       sin.sin_port= tserv->s_port;
-       sin.sin_family = AF_INET;
+       if ((tserv = getservbyname("time", "tcp")) == NULL)   /* find port # */
+               perror_msg_and_die("time");
+
+       if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)    /* get net connection */
+               perror_msg_and_die("socket");
+
+       memcpy(&s_in.sin_addr, h->h_addr, sizeof(s_in.sin_addr));
+       s_in.sin_port= tserv->s_port;
+       s_in.sin_family = AF_INET;
+
+       if (connect(fd, (struct sockaddr *)&s_in, sizeof(s_in)) < 0)      /* connect to time server */
+               perror_msg_and_die("%s", host);
+
+       if (read(fd, (void *)&nett, 4) != 4)    /* read time from server */
+               error_msg_and_die("%s did not send the complete time", host);
 
-       if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {    /* connect to time server */
-               error_msg("%s: %s\n", host, strerror(errno));
-               close(fd);
-               return(-1);
-       }
-       if (read(fd, (void *)&nett, 4) != 4) {  /* read time from server */
-               close(fd);
-               error_msg("%s did not send the complete time\n", host);
-       }
        close(fd);
 
        /* convert from network byte order to local byte order.
@@ -87,47 +78,39 @@ time_t askremotedate(char *host)
 
 int rdate_main(int argc, char **argv)
 {
-       time_t time;
+       time_t remote_time;
        int opt;
+       int setdate = 1;
+       int printdate = 1;
 
        /* Interpret command line args */
-       /* do special-case option parsing */
-       if (argv[1] && (strcmp(argv[1], "--help") == 0))
-               usage(rdate_usage);
-
-       /* do normal option parsing */
-       while ((opt = getopt(argc, argv, "Hsp")) > 0) {
+       while ((opt = getopt(argc, argv, "sp")) > 0) {
                switch (opt) {
-                       default:
-                       case 'H':
-                               usage(rdate_usage);
-                               break;
                        case 's':
-                               setdate++;
+                               printdate = 0;
+                               setdate = 1;
                                break;
                        case 'p':
-                               printdate++;
+                               printdate = 1;
+                               setdate = 0;
                                break;
+                       default:
+                               show_usage();
                }
        }
 
-       /* the default action is to set the date */
-       if (printdate==0 && setdate==0) setdate++;
+       if (optind == argc)
+               show_usage();
 
-       if (optind == argc) {
-               usage(rdate_usage);
-       }
+       remote_time = askremotedate(argv[optind]);
 
-       if ((time= askremotedate(argv[optind])) == (time_t)-1) {
-               return EXIT_FAILURE;
-       }
        if (setdate) {
-               if (stime(&time) < 0)
-                       error_msg_and_die("Could not set time of day: %s\n", strerror(errno));
-       }
-       if (printdate) {
-               fprintf(stdout, "%s", ctime(&time));
+               if (stime(&remote_time) < 0)
+                       perror_msg_and_die("Could not set time of day");
        }
 
+       if (printdate)
+               printf("%s", ctime(&remote_time));
+
        return EXIT_SUCCESS;
 }