Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/rdate.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/rdate.c (modified) (6 diffs)

branches/3.2/mindi-busybox/util-linux/rdate.c

@@ -2 +2 @@
 /*
  * The Rdate command will ask a time server for the RFC 868 time
- *  and optionally set the system time.
+ * and optionally set the system time.
  *
  * by Sterling Huxley <sterling@europa.com>
@@ -8 +8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
+
+//usage:#define rdate_trivial_usage
+//usage:       "[-sp] HOST"
+//usage:#define rdate_full_usage "\n\n"
+//usage:       "Get and possibly set the system date/time from a remote HOST\n"
+//usage:     "\n    -s  Set the system date/time (default)"
+//usage:     "\n    -p  Print the date/time"
 
 #include "libbb.h"
@@ -29 +36 @@
     fd = create_and_connect_stream_or_die(host, bb_lookup_port("time", "tcp", 37));
 
-    if (safe_read(fd, (void *)&nett, 4) != 4)    /* read time from server */
+    if (safe_read(fd, &nett, 4) != 4)    /* read time from server */
         bb_error_msg_and_die("%s did not send the complete time", host);
-    close(fd);
+    if (ENABLE_FEATURE_CLEAN_UP)
+        close(fd);
 
-    /* convert from network byte order to local byte order.
+    /* 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
+     * Subtract the RFC 868 time to get Linux epoch.
      */
 
@@ -47 +55 @@
 {
     time_t remote_time;
-    unsigned long flags;
+    unsigned flags;
 
     opt_complementary = "-1";
@@ -54 +62 @@
     remote_time = askremotedate(argv[optind]);
 
-    if ((flags & 2) == 0) {
+    if (!(flags & 2)) { /* no -p (-s may be present) */
         time_t current_time;
 
@@ -65 +73 @@
     }
 
-    if ((flags & 1) == 0)
+    if (flags != 1) /* not lone -s */
         printf("%s", ctime(&remote_time));