036585a911
FEATURE_GETOPT_LONG made dependent on LONG_OPTS. The folloving options are removed, now LONG_OPTS enables long options for affected applets: FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS They either had a small number of long options, or their long options are essential. Example: upstream addgroup and adduser have ONLY longopts, we should probably go further and get rid of non-standard short options. To this end, make addgroup and adduser "select LONG_OPTS". We had this breakage caused by us even in our own package! #if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP /* We try to use --gid, not -g, because "standard" addgroup * has no short option -g, it has only long --gid. */ argv[1] = (char*)"--gid"; #else /* Breaks if system in fact does NOT use busybox addgroup */ argv[1] = (char*)"-g"; #endif xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS. hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime Shorten help texts by omitting long option when short opt alternative exists. Reduction of size comes from the fact that store of an immediate (an address of longopts) to a fixed address (global variable) is a longer insn than pushing that immediate or passing it in a register. This effect is CPU-agnostic. function old new delta getopt32 1350 22 -1328 vgetopt32 - 1318 +1318 getopt32long - 24 +24 tftpd_main 562 567 +5 scan_recursive 376 380 +4 collect_cpu 545 546 +1 date_main 1096 1095 -1 hostname_main 262 259 -3 uname_main 259 255 -4 setpriv_main 362 358 -4 rmdir_main 191 187 -4 mv_main 562 558 -4 ipcalc_main 548 544 -4 ifenslave_main 641 637 -4 gzip_main 192 188 -4 gunzip_main 77 73 -4 fsfreeze_main 81 77 -4 flock_main 318 314 -4 deluser_main 337 333 -4 cp_main 374 370 -4 chown_main 175 171 -4 applet_long_options 4 - -4 xargs_main 894 889 -5 wget_main 2540 2535 -5 udhcpc_main 2767 2762 -5 touch_main 436 431 -5 tar_main 1014 1009 -5 start_stop_daemon_main 1033 1028 -5 sed_main 682 677 -5 script_main 1082 1077 -5 run_parts_main 330 325 -5 rtcwake_main 459 454 -5 od_main 2169 2164 -5 nl_main 201 196 -5 modprobe_main 773 768 -5 mkdir_main 160 155 -5 ls_main 568 563 -5 install_main 773 768 -5 hwclock_main 411 406 -5 getopt_main 622 617 -5 fstrim_main 256 251 -5 env_main 198 193 -5 dumpleases_main 635 630 -5 dpkg_main 3991 3986 -5 diff_main 1355 1350 -5 cryptpw_main 233 228 -5 cpio_main 593 588 -5 conspy_main 1135 1130 -5 chpasswd_main 313 308 -5 adduser_main 887 882 -5 addgroup_main 416 411 -5 ftpgetput_main 351 345 -6 get_terminal_width_height 242 234 -8 expand_main 690 680 -10 static.expand_longopts 18 - -18 static.unexpand_longopts 27 - -27 mkdir_longopts 28 - -28 env_longopts 30 - -30 static.ifenslave_longopts 34 - -34 mv_longopts 46 - -46 static.rmdir_longopts 48 - -48 packed_usage 31739 31687 -52 ------------------------------------------------------------------------------ (add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes text data bss dec hex filename 915681 485 6880 923046 e15a6 busybox_old 915428 485 6876 922789 e14a5 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
126 lines
3.5 KiB
C
126 lines
3.5 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
//applet:IF_DUMPLEASES(APPLET_NOEXEC(dumpleases, dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP, dumpleases))
|
|
|
|
//kbuild:lib-$(CONFIG_DUMPLEASES) += dumpleases.o
|
|
|
|
//usage:#define dumpleases_trivial_usage
|
|
//usage: "[-r|-a] [-d] [-f LEASEFILE]"
|
|
//usage:#define dumpleases_full_usage "\n\n"
|
|
//usage: "Display DHCP leases granted by udhcpd\n"
|
|
//usage: IF_LONG_OPTS(
|
|
//usage: "\n -f,--file FILE Lease file"
|
|
//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(
|
|
//usage: "\n -f FILE Lease file"
|
|
//usage: "\n -r Show remaining time"
|
|
//usage: "\n -a Show expiration time"
|
|
//usage: "\n -d Show time in seconds"
|
|
//usage: )
|
|
|
|
#include "common.h"
|
|
#include "dhcpd.h"
|
|
#include "unicode.h"
|
|
|
|
int dumpleases_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int dumpleases_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
int fd;
|
|
int i;
|
|
unsigned opt;
|
|
int64_t written_at, curr;
|
|
const char *file = LEASES_FILE;
|
|
struct dyn_lease lease;
|
|
|
|
enum {
|
|
OPT_a = 0x1, // -a
|
|
OPT_r = 0x2, // -r
|
|
OPT_f = 0x4, // -f
|
|
OPT_d = 0x8, // -d
|
|
};
|
|
#if ENABLE_LONG_OPTS
|
|
static const char dumpleases_longopts[] ALIGN1 =
|
|
"absolute\0" No_argument "a"
|
|
"remaining\0" No_argument "r"
|
|
"file\0" Required_argument "f"
|
|
"decimal\0" No_argument "d"
|
|
;
|
|
|
|
#endif
|
|
init_unicode();
|
|
|
|
opt_complementary = "=0:a--r:r--a";
|
|
opt = getopt32long(argv, "arf:d", dumpleases_longopts, &file);
|
|
|
|
fd = xopen(file, O_RDONLY);
|
|
|
|
/* "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" */
|
|
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));
|
|
written_at = SWAP_BE64(written_at);
|
|
curr = time(NULL);
|
|
if (curr < written_at)
|
|
written_at = curr; /* lease file from future! :) */
|
|
|
|
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++) {
|
|
printf(fmt, lease.lease_mac[i]);
|
|
fmt = ":%02x";
|
|
}
|
|
addr.s_addr = lease.lease_nip;
|
|
#if ENABLE_UNICODE_SUPPORT
|
|
{
|
|
char *uni_name = unicode_conv_to_printable_fixedwidth(/*NULL,*/ lease.hostname, 19);
|
|
printf(" %-16s%s ", inet_ntoa(addr), uni_name);
|
|
free(uni_name);
|
|
}
|
|
#else
|
|
/* actually, 15+1 and 19+1, +1 is a space between columns */
|
|
/* lease.hostname is char[20] and is always NUL terminated */
|
|
printf(" %-16s%-20s", inet_ntoa(addr), lease.hostname);
|
|
#endif
|
|
expires_abs = ntohl(lease.expires) + written_at;
|
|
if (expires_abs <= curr) {
|
|
puts("expired");
|
|
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;
|
|
unsigned expires = expires_abs - curr;
|
|
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 { /* -a */
|
|
time_t t = expires_abs;
|
|
fputs(ctime(&t), stdout);
|
|
}
|
|
}
|
|
/* close(fd); */
|
|
|
|
return 0;
|
|
}
|