X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Frdate.c;h=c740a691e5b6f4818395491177bd11b7a027d860;hb=6ced427a6debb71967a8b9cebc12e31c08de0f6a;hp=a3ea3a85bf3204f8a8d35e810b12b1a0ce92d105;hpb=cbe31dace5fb24304694d399b9eb267fbe752516;p=oweals%2Fbusybox.git

diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index a3ea3a85b..c740a691e 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -5,75 +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"
-#define BB_DECLARE_EXTERN
-#include "messages.c"
 
 
 static const int RFC_868_BIAS = 2208988800UL;
 
-int setdate= 0;
-int printdate= 0;
+static void socket_timeout(int sig)
+{
+	bb_error_msg_and_die("timeout connecting to time server");
+}
 
-time_t askremotedate(char *host)
+static time_t askremotedate(const char *host)
 {
-	struct hostent *h;
-	struct sockaddr_in sin;
-	struct servent *tserv;
-	unsigned long int nett, localt;
+	unsigned long nett;
+	struct sockaddr_in s_in;
 	int fd;
 
-	if (!(h = gethostbyname(host))) {	/* get the IP addr */
-		perror_msg("%s", host);
-		return(-1);
-	}
-	if ((tserv = getservbyname("time", "tcp")) == NULL) { /* find port # */
-		perror_msg("%s", "time");
-		return(-1);
-	}
-	if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {  /* get net connection */
-		perror_msg("%s", "socket");
-		return(-1);
-	}
+	bb_lookup_host(&s_in, host);
+	s_in.sin_port = bb_lookup_port("time", "tcp", 37);
 
-	memcpy(&sin.sin_addr, h->h_addr, sizeof(sin.sin_addr));
-	sin.sin_port= tserv->s_port;
-	sin.sin_family = AF_INET;
+	/* Add a timeout for dead or inaccessible servers */
+	alarm(10);
+	signal(SIGALRM, socket_timeout);
 
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {	/* connect to time server */
-		perror_msg("%s", host);
-		close(fd);
-		return(-1);
-	}
-	if (read(fd, (void *)&nett, 4) != 4) {	/* read time from server */
-		close(fd);
-		error_msg("%s did not send the complete time", host);
-	}
+	fd = xconnect(&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.
@@ -82,54 +54,33 @@ time_t askremotedate(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 time;
-	int opt;
-
-	/* Interpret command line args */
-	/* do special-case option parsing */
-	if (argv[1] && (strcmp(argv[1], "--help") == 0))
-		show_usage();
-
-	/* do normal option parsing */
-	while ((opt = getopt(argc, argv, "Hsp")) > 0) {
-		switch (opt) {
-			default:
-			case 'H':
-				show_usage();
-				break;
-			case 's':
-				setdate++;
-				break;
-			case 'p':
-				printdate++;
-				break;
-		}
-	}
+	time_t remote_time;
+	unsigned long flags;
 
-	/* the default action is to set the date */
-	if (printdate==0 && setdate==0) setdate++;
+	bb_opt_complementally = "-1";
+	flags = bb_getopt_ulflags(argc, argv, "sp");
 
-	if (optind == argc) {
-		show_usage();
-	}
+	remote_time = askremotedate(argv[optind]);
 
-	if ((time= askremotedate(argv[optind])) == (time_t)-1) {
-		return EXIT_FAILURE;
-	}
-	if (setdate) {
-		if (stime(&time) < 0)
-			perror_msg_and_die("Could not set time of day");
-	}
-	if (printdate) {
-		printf("%s", ctime(&time));
+	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("Could not set time of day");
 	}
 
+	if ((flags & 1) == 0)
+		printf("%s", ctime(&remote_time));
+
 	return EXIT_SUCCESS;
 }