mdev: fix a bug where we were eating argv[0] of helper

[oweals/busybox.git] / networking / udhcp / dumpleases.c

diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 4c6107cf7d7ecebeba31b71b13b488759a6838a6..c98005f138cb2e9e55d40c4c2dd4f2797637e869 100644 (file)
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -1,88 +1,66 @@
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <time.h>
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ */
 
-#include "leases.h"
-#include "busybox.h"
+#include "common.h"
+#include "dhcpd.h"
 
-#define REMAINING 0
-#define ABSOLUTE 1
-
-int dumpleases_main(int argc, char *argv[])
+int dumpleases_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dumpleases_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
-       FILE *fp;
-       int i, c, mode = REMAINING;
-       long expires;
-       const char *file = leases_file;
+       int fd;
+       int i;
+       unsigned opt;
+       time_t expires;
+       const char *file = LEASES_FILE;
        struct dhcpOfferedAddr lease;
        struct in_addr addr;
-       
-       static const struct option options[] = {
-               {"absolute", 0, 0, 'a'},
-               {"remaining", 0, 0, 'r'},
-               {"file", 1, 0, 'f'},
-               {0, 0, 0, 0}
+
+       enum {
+               OPT_a   = 0x1,  // -a
+               OPT_r   = 0x2,  // -r
+               OPT_f   = 0x4,  // -f
        };
+#if ENABLE_GETOPT_LONG
+       static const char dumpleases_longopts[] ALIGN1 =
+               "absolute\0"  No_argument       "a"
+               "remaining\0" No_argument       "r"
+               "file\0"      Required_argument "f"
+               ;
 
-       while (1) {
-               int option_index = 0;
-               c = getopt_long(argc, argv, "arf:", options, &option_index);
-               if (c == -1) break;
-               
-               switch (c) {
-               case 'a': mode = ABSOLUTE; break;
-               case 'r': mode = REMAINING; break;
-               case 'f':
-                       file =  optarg;
-                       break;
-               default:
-                       bb_show_usage();
-               }
-       }
-                       
-       fp = bb_xfopen(file, "r");
+       applet_long_options = dumpleases_longopts;
+#endif
+       opt_complementary = "=0:a--r:r--a";
+       opt = getopt32(argv, "arf:", &file);
 
-       printf("Mac Address       IP-Address      Expires %s\n", mode == REMAINING ? "in" : "at");  
-       /*     "00:00:00:00:00:00 255.255.255.255 Wed Jun 30 21:49:08 1993" */
-       while (fread(&lease, sizeof(lease), 1, fp)) {
+       fd = xopen(file, O_RDONLY);
 
-               for (i = 0; i < 6; i++) {
-                       printf("%02x", lease.chaddr[i]);
-                       if (i != 5) printf(":");
+       printf("Mac Address       IP-Address      Expires %s\n", (opt & OPT_a) ? "at" : "in");
+       /*     "00:00:00:00:00:00 255.255.255.255 Wed Jun 30 21:49:08 1993" */
+       while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
+               printf(":%02x"+1, lease.chaddr[0]);
+               for (i = 1; i < 6; i++) {
+                       printf(":%02x", lease.chaddr[i]);
                }
                addr.s_addr = lease.yiaddr;
-               printf(" %-15s", inet_ntoa(addr));
+               printf(" %-15s ", inet_ntoa(addr));
                expires = ntohl(lease.expires);
-               printf(" ");
-               if (mode == REMAINING) {
-                       if (!expires) printf("expired\n");
+               if (!(opt & OPT_a)) { /* no -a */
+                       if (!expires)
+                               puts("expired");
                        else {
-                               if (expires > 60*60*24) {
-                                       printf("%ld days, ", expires / (60*60*24));
-                                       expires %= 60*60*24;
-                               }
-                               if (expires > 60*60) {
-                                       printf("%ld hours, ", expires / (60*60));
-                                       expires %= 60*60;
-                               }
-                               if (expires > 60) {
-                                       printf("%ld minutes, ", expires / 60);
-                                       expires %= 60;
-                               }
-                               printf("%ld seconds\n", expires);
+                               unsigned d, h, m;
+                               d = expires / (24*60*60); expires %= (24*60*60);
+                               h = expires / (60*60); expires %= (60*60);
+                               m = expires / 60; expires %= 60;
+                               if (d) printf("%u days ", d);
+                               printf("%02u:%02u:%02u\n", h, m, (unsigned)expires);
                        }
-               } else printf("%s", ctime(&expires));
+               } else /* -a */
+                       fputs(ctime(&expires), stdout);
        }
-       fclose(fp);
-       
+       /* close(fd); */
+
        return 0;
 }