Various cleanups I made while going through Erik Hovland's patch submissions,

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

diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 4c6107cf7d7ecebeba31b71b13b488759a6838a6..08a22f17d2fa7ac668065eee5fbdef6d20f21f46 100644 (file)
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -1,6 +1,11 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ */
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <sys/wait.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -11,21 +16,42 @@
 #include <getopt.h>
 #include <time.h>
 
+#include "dhcpd.h"
 #include "leases.h"
-#include "busybox.h"
+#include "libbb_udhcp.h"
 
 #define REMAINING 0
 #define ABSOLUTE 1
 
+
+#ifndef IN_BUSYBOX
+static void ATTRIBUTE_NORETURN show_usage(void)
+{
+       printf(
+"Usage: dumpleases -f <file> -[r|a]\n\n"
+"  -f, --file=FILENAME             Leases file to load\n"
+"  -r, --remaining                 Interepret lease times as time remaining\n"
+"  -a, --absolute                  Interepret lease times as expire time\n");
+       exit(0);
+}
+#else
+#define show_usage bb_show_usage
+#endif
+
+
+#ifdef IN_BUSYBOX
 int dumpleases_main(int argc, char *argv[])
+#else
+int main(int argc, char *argv[])
+#endif
 {
        FILE *fp;
        int i, c, mode = REMAINING;
        long expires;
-       const char *file = leases_file;
+       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'},
@@ -37,21 +63,21 @@ int dumpleases_main(int argc, char *argv[])
                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;
+                       file = optarg;
                        break;
                default:
-                       bb_show_usage();
+                       show_usage();
                }
        }
-                       
-       fp = bb_xfopen(file, "r");
 
-       printf("Mac Address       IP-Address      Expires %s\n", mode == REMAINING ? "in" : "at");  
+       fp = xfopen(file, "r");
+
+       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)) {
 
@@ -83,6 +109,6 @@ int dumpleases_main(int argc, char *argv[])
                } else printf("%s", ctime(&expires));
        }
        fclose(fp);
-       
+
        return 0;
 }