Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/udhcp/dumpleases.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/networking/udhcp/dumpleases.c (modified) (9 diffs)

branches/3.3/mindi-busybox/networking/udhcp/dumpleases.c

@@ -5 +5 @@
 
 //usage:#define dumpleases_trivial_usage
-//usage:       "[-r|-a] [-f LEASEFILE]"
+//usage:       "[-r|-a] [-d] [-f LEASEFILE]"
 //usage:#define dumpleases_full_usage "\n\n"
 //usage:       "Display DHCP leases granted by udhcpd\n"
@@ -12 +12 @@
 //usage:     "\n    -r,--remaining  Show remaining time"
 //usage:     "\n    -a,--absolute   Show expiration time"
+//usage:     "\n    -d,--decimal    Show time in seconds"
 //usage:    )
 //usage:    IF_NOT_LONG_OPTS(
@@ -17 +18 @@
 //usage:     "\n    -r  Show remaining time"
 //usage:     "\n    -a  Show expiration time"
+//usage:     "\n    -d  Show time in seconds"
 //usage:    )
 
@@ -29 +31 @@
     int i;
     unsigned opt;
-    int64_t written_at, curr, expires_abs;
+    int64_t written_at, curr;
     const char *file = LEASES_FILE;
     struct dyn_lease lease;
-    struct in_addr addr;
 
     enum {
@@ -38 +39 @@
         OPT_r = 0x2, // -r
         OPT_f = 0x4, // -f
+        OPT_d = 0x8, // -d
     };
 #if ENABLE_LONG_OPTS
@@ -44 +46 @@
         "remaining\0" No_argument       "r"
         "file\0"      Required_argument "f"
+        "decimal\0"   No_argument       "d"
         ;
 
@@ -51 +54 @@
 
     opt_complementary = "=0:a--r:r--a";
-    opt = getopt32(argv, "arf:", &file);
+    opt = getopt32(argv, "arf:d", &file);
 
     fd = xopen(file, O_RDONLY);
 
-    printf("Mac Address       IP Address      Host Name           Expires %s\n", (opt & OPT_a) ? "at" : "in");
+    /*     "123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 */
     /*     "00:00:00:00:00:00 255.255.255.255 ABCDEFGHIJKLMNOPQRS Wed Jun 30 21:49:08 1993" */
-    /*     "123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 */
+    printf("Mac %-14s"       "IP %-13s"      "Host %-15s"        "Expires %s\n",
+        "Address", "Address", "Name",
+        (opt & OPT_a) ? "at" : "in"
+    );
 
     xread(fd, &written_at, sizeof(written_at));
@@ -66 +72 @@
 
     while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
+        struct in_addr addr;
+        int64_t expires_abs;
+
         const char *fmt = ":%02x" + 1;
         for (i = 0; i < 6; i++) {
@@ -88 +97 @@
             continue;
         }
+        if (opt & OPT_d) {
+            /* -d: decimal time */
+            if (!(opt & OPT_a))
+                expires_abs -= curr;
+            printf("%llu\n", (unsigned long long) expires_abs);
+            continue;
+        }
         if (!(opt & OPT_a)) { /* no -a */
             unsigned d, h, m;