Bump to version 1.22.1

[platform/upstream/busybox.git] / util-linux / rdate.c

diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 27bd1b4..6e35cd5 100644 (file)
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -1,86 +1,79 @@
 /* vi: set sw=4 ts=4: */
 /*
  * The Rdate command will ask a time server for the RFC 868 time
- *  and optionally set the system time.
+ * and optionally set the system time.
  *
  * by Sterling Huxley <sterling@europa.com>
  *
- * Licensed under GPL v2 or later, see file License for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 
-#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>
+//usage:#define rdate_trivial_usage
+//usage:       "[-sp] HOST"
+//usage:#define rdate_full_usage "\n\n"
+//usage:       "Get and possibly set the system date/time from a remote HOST\n"
+//usage:     "\n       -s      Set the system date/time (default)"
+//usage:     "\n       -p      Print the date/time"
 
-#include "busybox.h"
+#include "libbb.h"
 
+enum { RFC_868_BIAS = 2208988800UL };
 
-static const int RFC_868_BIAS = 2208988800UL;
-
-static void socket_timeout(int sig)
+static void socket_timeout(int sig UNUSED_PARAM)
 {
        bb_error_msg_and_die("timeout connecting to time server");
 }
 
 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 */
        alarm(10);
        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 */
+       if (safe_read(fd, &nett, 4) != 4)    /* read time from server */
                bb_error_msg_and_die("%s did not send the complete time", host);
-       close(fd);
+       if (ENABLE_FEATURE_CLEAN_UP)
+               close(fd);
 
-       /* convert from network byte order to local byte order.
+       /* 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) MAIN_EXTERNALLY_VISIBLE;
+int rdate_main(int argc UNUSED_PARAM, char **argv)
 {
        time_t remote_time;
-       unsigned long flags;
+       unsigned flags;
 
-       bb_opt_complementally = "-1";
-       flags = bb_getopt_ulflags(argc, argv, "sp");
+       opt_complementary = "-1";
+       flags = getopt32(argv, "sp");
 
        remote_time = askremotedate(argv[optind]);
 
-       if (flags & 1) {
+       if (!(flags & 2)) { /* no -p (-s may be present) */
                time_t current_time;
 
                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");
-
-       /* No need to check for the -p flag as it's the only option left */
+                               bb_perror_msg_and_die("can't set time of day");
+       }
 
-       } else printf("%s", ctime(&remote_time));
+       if (flags != 1) /* not lone -s */
+               printf("%s", ctime(&remote_time));
 
        return EXIT_SUCCESS;
 }