From 6a395904343d959e24a4c0420b572c450d5a0d8c Mon Sep 17 00:00:00 2001 From: aldot Date: Sat, 3 Jun 2006 10:24:20 +0000 Subject: - 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. git-svn-id: svn://busybox.net/trunk/busybox@15269 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- util-linux/rdate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util-linux/rdate.c b/util-linux/rdate.c index 27bd1b481..c740a691e 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c @@ -68,7 +68,7 @@ int rdate_main(int argc, char **argv) remote_time = askremotedate(argv[optind]); - if (flags & 1) { + if ((flags & 2) == 0) { time_t current_time; time(¤t_time); @@ -77,10 +77,10 @@ int rdate_main(int argc, char **argv) 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 */ - - } else printf("%s", ctime(&remote_time)); + if ((flags & 1) == 0) + printf("%s", ctime(&remote_time)); return EXIT_SUCCESS; } -- cgit v1.2.3-55-g6feb