Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/miscutils/adjtimex.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/miscutils/adjtimex.c (modified) (4 diffs)

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

@@ -12 +12 @@
  */
 
-#include "busybox.h"
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include "libbb.h"
 #include <sys/timex.h>
 
-static const struct {int bit; const char *name;} statlist[] = {
+static const struct {
+    int bit;
+    const char *name;
+} statlist[] = {
     { STA_PLL,       "PLL"       },
     { STA_PPSFREQ,   "PPSFREQ"   },
@@ -33 +32 @@
     { STA_PPSERROR,  "PPSERROR"  },
     { STA_CLOCKERR,  "CLOCKERR"  },
-    { 0, NULL } };
+    { 0, NULL }
+};
 
-static const char * const ret_code_descript[] = {
+static const char *const ret_code_descript[] = {
     "clock synchronized",
     "insert leap second",
@@ -41 +41 @@
     "leap second in progress",
     "leap second has occurred",
-    "clock not synchronized" };
+    "clock not synchronized"
+};
 
+int adjtimex_main(int argc, char **argv);
 int adjtimex_main(int argc, char **argv)
 {
+    enum {
+        OPT_quiet = 0x1
+    };
+    unsigned opt;
+    char *opt_o, *opt_f, *opt_p, *opt_t;
     struct timex txc;
-    int quiet=0;
-    int c, i, ret, sep;
+    int i, ret, sep;
     const char *descript;
     txc.modes=0;
-    for (;;) {
-        c = getopt( argc, argv, "qo:f:p:t:");
-        if (c == EOF) break;
-        switch (c) {
-            case 'q':
-                quiet=1;
-                break;
-            case 'o':
-                txc.offset = atoi(optarg);
-                txc.modes |= ADJ_OFFSET_SINGLESHOT;
-                break;
-            case 'f':
-                txc.freq = atoi(optarg);
-                txc.modes |= ADJ_FREQUENCY;
-                break;
-            case 'p':
-                txc.constant = atoi(optarg);
-                txc.modes |= ADJ_TIMECONST;
-                break;
-            case 't':
-                txc.tick = atoi(optarg);
-                txc.modes |= ADJ_TICK;
-                break;
-            default:
-                bb_show_usage();
-                exit(1);
-        }
+
+    opt = getopt32(argv, "qo:f:p:t:",
+            &opt_o, &opt_f, &opt_p, &opt_t);
+    //if (opt & 0x1) // -q
+    if (opt & 0x2) { // -o
+        txc.offset = xatol(opt_o);
+        txc.modes |= ADJ_OFFSET_SINGLESHOT;
+    }
+    if (opt & 0x4) { // -f
+        txc.freq = xatol(opt_f);
+        txc.modes |= ADJ_FREQUENCY;
+    }
+    if (opt & 0x8) { // -p
+        txc.constant = xatol(opt_p);
+        txc.modes |= ADJ_TIMECONST;
+    }
+    if (opt & 0x10) { // -t
+        txc.tick = xatol(opt_t);
+        txc.modes |= ADJ_TICK;
     }
     if (argc != optind) { /* no valid non-option parameters */
         bb_show_usage();
-        exit(1);
     }
 
@@ -87 +84 @@
     if (ret < 0) perror("adjtimex");
 
-    if (!quiet && ret>=0) {
+    if (!(opt & OPT_quiet) && ret>=0) {
         printf(
             "    mode:         %d\n"