svn commit: trunk/busybox/util-linux

[aldot at busybox.net]

Author: aldot
Date: 2006-06-03 03:24:20 -0700 (Sat, 03 Jun 2006)
New Revision: 15269

Log:
- No options should set the current system time.
Shaun Jackman writes:
A bug introduced in svn 11946 broke rdate. It no longer sets the
current system time when no options are specified. The options have
the opposite sense from what one might think, and, oddly enough, -ps
is intentionally a no-op.

Quoth rdate(8) from the BSD System Manager's Manual:

    -p      Do not set, just print the remote time
    -s      Do not print the time.


Modified:
   trunk/busybox/util-linux/rdate.c


Changeset:
Modified: trunk/busybox/util-linux/rdate.c
===================================================================
--- trunk/busybox/util-linux/rdate.c	2006-06-02 21:30:40 UTC (rev 15268)
+++ trunk/busybox/util-linux/rdate.c	2006-06-03 10:24:20 UTC (rev 15269)
@@ -68,7 +68,7 @@
 
 	remote_time = askremotedate(argv[optind]);
 
-	if (flags & 1) {
+	if ((flags & 2) == 0) {
 		time_t current_time;
 
 		time(&current_time);
@@ -77,10 +77,10 @@
 		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 */
+	if ((flags & 1) == 0)
+		printf("%s", ctime(&remote_time));
 
-	} else printf("%s", ctime(&remote_time));
-
 	return EXIT_SUCCESS;
 }