Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/util-linux/rdate.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/util-linux/rdate.c (modified) (6 diffs)

branches/2.2.5/mindi-busybox/util-linux/rdate.c

@@ -9 +9 @@
 */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
+#include "libbb.h"
 
-#include "busybox.h"
-
-
-static const int RFC_868_BIAS = 2208988800UL;
+enum { RFC_868_BIAS = 2208988800UL };
 
 static void socket_timeout(int sig)
@@ -32 +20 @@
 static time_t askremotedate(const char *host)
 {
-    unsigned long nett;
-    struct sockaddr_in s_in;
+    uint32_t nett;
     int fd;
-
-    bb_lookup_host(&s_in, host);
-    s_in.sin_port = bb_lookup_port("time", "tcp", 37);
 
     /* Add a timeout for dead or inaccessible servers */
@@ -43 +27 @@
     signal(SIGALRM, socket_timeout);
 
-    fd = xconnect(&s_in);
+    fd = create_and_connect_stream_or_die(host, bb_lookup_port("time", "tcp", 37));
 
     if (safe_read(fd, (void *)&nett, 4) != 4)    /* read time from server */
@@ -51 +35 @@
     /* convert from network byte order to local byte order.
      * RFC 868 time is the number of seconds
-     *  since 00:00 (midnight) 1 January 1900 GMT
-     *  the RFC 868 time 2,208,988,800 corresponds to 00:00  1 Jan 1970 GMT
-     * Subtract the RFC 868 time  to get Linux epoch
+     * since 00:00 (midnight) 1 January 1900 GMT
+     * the RFC 868 time 2,208,988,800 corresponds to 00:00  1 Jan 1970 GMT
+     * Subtract the RFC 868 time to get Linux epoch
      */
 
-    return(ntohl(nett) - RFC_868_BIAS);
+    return ntohl(nett) - RFC_868_BIAS;
 }
 
+int rdate_main(int argc, char **argv);
 int rdate_main(int argc, char **argv)
 {
@@ -64 +49 @@
     unsigned long flags;
 
-    bb_opt_complementally = "-1";
-    flags = bb_getopt_ulflags(argc, argv, "sp");
+    opt_complementary = "-1";
+    flags = getopt32(argv, "sp");
 
     remote_time = askremotedate(argv[optind]);
@@ -74 +59 @@
         time(&current_time);
         if (current_time == remote_time)
-            bb_error_msg("Current time matches remote time.");
+            bb_error_msg("current time matches remote time");
         else
             if (stime(&remote_time) < 0)
-                bb_perror_msg_and_die("Could not set time of day");
+                bb_perror_msg_and_die("cannot set time of day");
     }