X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fudhcp%2Fdumpleases.c;h=a0e81bb1306038bed003dfc85f9c93acfe8ffad2;hb=83e5d6f77237b64853c194b0ce592e77ef677c4d;hp=4c1ee131f01ffb9910705d3a7f4822e38996e6f5;hpb=8b3845106a086ea78a24d7981ee41e76070e83fe;p=oweals%2Fbusybox.git

diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 4c1ee131f..a0e81bb13 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -1,52 +1,25 @@
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.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>
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ */
 #include <getopt.h>
-#include <time.h>
 
-#include "leases.h"
-#include "libbb_udhcp.h"
+#include "common.h"
+#include "dhcpd.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 remaing\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 fp;
 	int i, c, mode = REMAINING;
-	long expires;
+	unsigned long 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'},
@@ -58,7 +31,7 @@ int 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;
@@ -66,44 +39,36 @@ int main(int argc, char *argv[])
 			file = optarg;
 			break;
 		default:
-			show_usage();
+			bb_show_usage();
 		}
 	}
-			
-	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)) {
+	fp = 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", mode == REMAINING ? "in" : "at");
+	/*     "00:00:00:00:00:00 255.255.255.255 Wed Jun 30 21:49:08 1993" */
+	while (full_read(fp, &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 (!expires)
+				printf("expired\n");
 			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 fputs(ctime(&expires), stdout);
 	}
-	fclose(fp);
-	
+	/* close(fp); */
+
 	return 0;
 }