X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Frdate.c;h=0880edff50e5433680ed854176d9099fea497116;hb=11c17f75a7f29da47eae35a2f41d274a99a95760;hp=3c3b152a22657462375cd673a4d479255fb6c0cc;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git

diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 3c3b152a2..0880edff5 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -5,99 +5,66 @@
  *
  * 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 "busybox.h"
+#include "libbb.h"
 
+enum { RFC_868_BIAS = 2208988800UL };
 
-static const int RFC_868_BIAS = 2208988800UL;
+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 int nett, localt;
-	const char *port="37";
+	uint32_t nett;
 	int fd;
 
-	if (getservbyname("time", "tcp") != NULL)
-		port="time";
+	/* Add a timeout for dead or inaccessible servers */
+	alarm(10);
+	signal(SIGALRM, socket_timeout);
 
-	fd = xconnect(host, port);
+	fd = create_and_connect_stream_or_die(host, bb_lookup_port("time", "tcp", 37));
 
-	if (read(fd, (void *)&nett, 4) != 4)    /* read time from server */
+	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.
 	 * 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
 	 */
-	localt= ntohl(nett) - RFC_868_BIAS;
 
-	return(localt);
+	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;
-	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:
-				bb_show_usage();
-		}
-	}
+	unsigned long flags;
 
-	if (optind == argc)
-		bb_show_usage();
+	opt_complementary = "-1";
+	flags = getopt32(argv, "sp");
 
 	remote_time = askremotedate(argv[optind]);
 
-	if (setdate) {
-		if (stime(&remote_time) < 0)
-			bb_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;