Cut-n-paste strikes again

[oweals/busybox.git] / util-linux / rdate.c

diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index df7d7bbc413445cbc76e8851bc3fe2e68969d432..a73e8eebf523ea7f4415f0d9ecf87b706f040be5 100644 (file)
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -32,24 +32,35 @@
 #include <time.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <signal.h>
+
 #include "busybox.h"
 
 
 static const int RFC_868_BIAS = 2208988800UL;
 
+static void socket_timeout(int sig)
+{
+       bb_error_msg_and_die("timeout connecting to time server");
+}
+
 static time_t askremotedate(const char *host)
 {
        unsigned long int nett, localt;
-       const char *port="37";
+       struct sockaddr_in s_in;
        int fd;
 
-       if (getservbyname("time", "tcp") != NULL)
-               port="time";
+       bb_lookup_host(&s_in, host);
+       s_in.sin_port = bb_lookup_port("time", "tcp", 37);
+
+       /* Add a timeout for dead or non accessable servers */
+       alarm(10);
+       signal(SIGALRM, socket_timeout);
 
-       fd = xconnect(host, port);
+       fd = xconnect(&s_in);
 
-       if (read(fd, (void *)&nett, 4) != 4)    /* read time from server */
-               error_msg_and_die("%s did not send the complete time", host);
+       if (safe_read(fd, (void *)&nett, 4) != 4)    /* read time from server */
+               bb_error_msg_and_die("%s did not send the complete time", host);
 
        close(fd);
 
@@ -83,18 +94,24 @@ int rdate_main(int argc, char **argv)
                                setdate = 0;
                                break;
                        default:
-                               show_usage();
+                               bb_show_usage();
                }
        }
 
        if (optind == argc)
-               show_usage();
+               bb_show_usage();
 
        remote_time = askremotedate(argv[optind]);
 
        if (setdate) {
-               if (stime(&remote_time) < 0)
-                       perror_msg_and_die("Could not set time of day");
+               time_t current_time;
+
+               time(&current_time);
+               if (current_time == 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");
        }
 
        if (printdate)