Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/adjtimex.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/miscutils/adjtimex.c (modified) (7 diffs)

branches/3.3/mindi-busybox/miscutils/adjtimex.c

@@ -15 +15 @@
 //usage:       "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
 //usage:#define adjtimex_full_usage "\n\n"
-//usage:       "Read and optionally set system timebase parameters. See adjtimex(2)\n"
+//usage:       "Read or set kernel time variables. See adjtimex(2)\n"
 //usage:     "\n    -q  Quiet"
 //usage:     "\n    -o OFF  Time offset, microseconds"
 //usage:     "\n    -f FREQ Frequency adjust, integer kernel units (65536 is 1ppm)"
-//usage:     "\n        (positive values make clock run faster)"
 //usage:     "\n    -t TICK Microseconds per tick, usually 10000"
+//usage:     "\n        (positive -t or -f values make clock run faster)"
 //usage:     "\n    -p TCONST"
 
@@ -30 +30 @@
 #endif
 
-static const uint16_t statlist_bit[] = {
+static const uint16_t statlist_bit[] ALIGN2 = {
     STA_PLL,
     STA_PPSFREQ,
@@ -46 +46 @@
     0
 };
-static const char statlist_name[] =
+static const char statlist_name[] ALIGN1 =
     "PLL"       "\0"
     "PPSFREQ"   "\0"
@@ -62 +62 @@
 ;
 
-static const char ret_code_descript[] =
+static const char ret_code_descript[] ALIGN1 =
     "clock synchronized" "\0"
     "insert leap second" "\0"
@@ -112 +112 @@
 
     if (!(opt & OPT_quiet)) {
-        int sep;
+        const char *sep;
         const char *name;
 
         printf(
             "    mode:         %d\n"
-            "-o  offset:       %ld\n"
-            "-f  frequency:    %ld\n"
+            "-o  offset:       %ld us\n"
+            "-f  freq.adjust:  %ld (65536 = 1ppm)\n"
             "    maxerror:     %ld\n"
             "    esterror:     %ld\n"
@@ -126 +126 @@
 
         /* representative output of next code fragment:
-           "PLL | PPSTIME" */
+         * "PLL | PPSTIME"
+         */
         name = statlist_name;
-        sep = 0;
+        sep = "";
         for (i = 0; statlist_bit[i]; i++) {
             if (txc.status & statlist_bit[i]) {
-                if (sep)
-                    fputs(" | ", stdout);
-                fputs(name, stdout);
-                sep = 1;
+                printf("%s%s", sep, name);
+                sep = " | ";
             }
             name += strlen(name) + 1;
@@ -144 +143 @@
         printf(")\n"
             "-p  timeconstant: %ld\n"
-            "    precision:    %ld\n"
+            "    precision:    %ld us\n"
             "    tolerance:    %ld\n"
-            "-t  tick:         %ld\n"
+            "-t  tick:         %ld us\n"
             "    time.tv_sec:  %ld\n"
             "    time.tv_usec: %ld\n"