dumpleases: getopt32()-ization

(from Mats Erik Andersson <mats.andersson64@comhem.se>)
This commit is contained in:
Denis Vlasenko 2007-03-29 19:29:32 +00:00
parent a87ed2c716
commit 5e43d8591b

View File

@ -7,48 +7,40 @@
#include "common.h" #include "common.h"
#include "dhcpd.h" #include "dhcpd.h"
#define REMAINING 0
#define ABSOLUTE 1
int dumpleases_main(int argc, char *argv[]); int dumpleases_main(int argc, char *argv[]);
int dumpleases_main(int argc, char *argv[]) int dumpleases_main(int argc, char *argv[])
{ {
int fp; int fd;
int i, c, mode = REMAINING; int i;
unsigned long expires; unsigned opt;
time_t expires;
const char *file = LEASES_FILE; const char *file = LEASES_FILE;
struct dhcpOfferedAddr lease; struct dhcpOfferedAddr lease;
struct in_addr addr; struct in_addr addr;
enum {
OPT_a = 0x1, // -a
OPT_r = 0x2, // -r
OPT_f = 0x4, // -f
};
#if ENABLE_GETOPT_LONG
static const struct option options[] = { static const struct option options[] = {
{"absolute", 0, 0, 'a'}, { "absolute", no_argument, 0, 'a' },
{"remaining", 0, 0, 'r'}, { "remaining", no_argument, 0, 'r' },
{"file", 1, 0, 'f'}, { "file", required_argument, 0, 'f' },
{0, 0, 0, 0} { NULL, 0, 0, 0 }
}; };
while (1) { applet_long_options = options;
int option_index = 0; #endif
c = getopt_long(argc, argv, "arf:", options, &option_index); opt_complementary = "=0:?:a--r:r--a";
if (c == -1) break; opt = getopt32(argc, argv, "arf:", &file);
switch (c) { fd = xopen(file, O_RDONLY);
case 'a': mode = ABSOLUTE; break;
case 'r': mode = REMAINING; break;
case 'f':
file = optarg;
break;
default:
bb_show_usage();
}
}
fp = xopen(file, O_RDONLY); printf("Mac Address IP-Address Expires %s\n", (opt & OPT_a) ? "at" : "in");
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" */ /* "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)) { while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
printf(":%02x"+1, lease.chaddr[0]); printf(":%02x"+1, lease.chaddr[0]);
for (i = 1; i < 6; i++) { for (i = 1; i < 6; i++) {
printf(":%02x", lease.chaddr[i]); printf(":%02x", lease.chaddr[i]);
@ -56,9 +48,9 @@ int dumpleases_main(int argc, char *argv[])
addr.s_addr = lease.yiaddr; addr.s_addr = lease.yiaddr;
printf(" %-15s ", inet_ntoa(addr)); printf(" %-15s ", inet_ntoa(addr));
expires = ntohl(lease.expires); expires = ntohl(lease.expires);
if (mode == REMAINING) { if (!(opt & OPT_a)) { /* no -a */
if (!expires) if (!expires)
printf("expired\n"); puts("expired");
else { else {
unsigned d, h, m; unsigned d, h, m;
d = expires / (24*60*60); expires %= (24*60*60); d = expires / (24*60*60); expires %= (24*60*60);
@ -67,9 +59,10 @@ int dumpleases_main(int argc, char *argv[])
if (d) printf("%u days ", d); if (d) printf("%u days ", d);
printf("%02u:%02u:%02u\n", h, m, (unsigned)expires); printf("%02u:%02u:%02u\n", h, m, (unsigned)expires);
} }
} else fputs(ctime(&expires), stdout); } else /* -a */
fputs(ctime(&expires), stdout);
} }
/* close(fp); */ /* close(fd); */
return 0; return 0;
} }