umount: umount -a shouldn't stop on first failure

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

diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 50be4de8c2cee0f076a40ba430fcf4c38acdf841..645b0b9291ae12af1be793e431ab02c431b30e52 100644 (file)
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -5,64 +5,47 @@
  *
  * by Sterling Huxley <sterling@europa.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPL v2 or later, see file License for details.
 */
 
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <stdio.h>
-#include <getopt.h>
 #include <string.h>
 #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)
 {
-       struct hostent *h;
+       unsigned long nett;
        struct sockaddr_in s_in;
-       struct servent *tserv;
-       unsigned long int nett, localt;
        int fd;
 
-       h = xgethostbyname(host);         /* get the IP addr */
-
-       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");
+       bb_lookup_host(&s_in, host);
+       s_in.sin_port = bb_lookup_port("time", "tcp", 37);
 
-       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;
+       /* Add a timeout for dead or inaccessible servers */
+       alarm(10);
+       signal(SIGALRM, socket_timeout);
 
-       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);
+       fd = xconnect_tcp_v4(&s_in);
 
+       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);
 
        /* convert from network byte order to local byte order.
@@ -71,45 +54,32 @@ static time_t askremotedate(const char *host)
         *  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
         */
-       localt= ntohl(nett) - RFC_868_BIAS;
 
-       return(localt);
+       return(ntohl(nett) - RFC_868_BIAS);
 }
 
 int rdate_main(int argc, char **argv)
 {
        time_t remote_time;
-       int opt;
-       int setdate = 1;
-       int printdate = 1;
-
-       /* Interpret command line args */
-       while ((opt = getopt(argc, argv, "sp")) > 0) {
-               switch (opt) {
-                       case 's':
-                               printdate = 0;
-                               setdate = 1;
-                               break;
-                       case 'p':
-                               printdate = 1;
-                               setdate = 0;
-                               break;
-                       default:
-                               show_usage();
-               }
-       }
+       unsigned long flags;
 
-       if (optind == argc)
-               show_usage();
+       opt_complementary = "-1";
+       flags = getopt32(argc, argv, "sp");
 
        remote_time = askremotedate(argv[optind]);
 
-       if (setdate) {
-               if (stime(&remote_time) < 0)
-                       perror_msg_and_die("Could not set time of day");
+       if ((flags & 2) == 0) {
+               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("cannot set time of day");
        }
 
-       if (printdate)
+       if ((flags & 1) == 0)
                printf("%s", ctime(&remote_time));
 
        return EXIT_SUCCESS;