summaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenys Vlasenko2017-08-08 21:55:02 +0200
committerDenys Vlasenko2017-08-08 21:55:02 +0200
commit22542eca18e5807b72ddc78999f5101e33f17a53 (patch)
tree1271842a37c6215c998674a44bf7f561a0deff52 /loginutils
parent036585a911a5fe6c2cd77b808dd9150500f37272 (diff)
downloadbusybox-22542eca18e5807b72ddc78999f5101e33f17a53.zip
busybox-22542eca18e5807b72ddc78999f5101e33f17a53.tar.gz
getopt32: remove opt_complementary
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/addgroup.c7
-rw-r--r--loginutils/adduser.c13
-rw-r--r--loginutils/chpasswd.c6
-rw-r--r--loginutils/cryptpw.c7
-rw-r--r--loginutils/getty.c5
-rw-r--r--loginutils/vlock.c3
6 files changed, 23 insertions, 18 deletions
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 5a2b043..adef232 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -152,11 +152,12 @@ int addgroup_main(int argc UNUSED_PARAM, char **argv)
}
/* Syntax:
* addgroup group
- * addgroup -g num group
+ * addgroup --gid num group
* addgroup user group
* Check for min, max and missing args */
- opt_complementary = "-1:?2";
- opts = getopt32long(argv, "g:S", addgroup_longopts, &gid);
+ opts = getopt32long(argv, "^" "g:S" "\0" "-1:?2", addgroup_longopts,
+ &gid
+ );
/* move past the commandline options */
argv += optind;
//argc -= optind;
diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 8b92df9..b2b5be5 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -201,12 +201,15 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
pw.pw_shell = (char *)get_shell_name();
pw.pw_dir = NULL;
- /* at least one and at most two non-option args */
- /* disable interactive passwd for system accounts */
- opt_complementary = "-1:?2:SD";
- opts = getopt32long(argv, "h:g:s:G:DSHu:k:", adduser_longopts,
+ opts = getopt32long(argv, "^"
+ "h:g:s:G:DSHu:k:"
+ /* at least one and at most two non-option args */
+ /* disable interactive passwd for system accounts */
+ "\0" "-1:?2:SD",
+ adduser_longopts,
&pw.pw_dir, &pw.pw_gecos, &pw.pw_shell,
- &usegroup, &uid, &skel);
+ &usegroup, &uid, &skel
+ );
if (opts & OPT_UID)
pw.pw_uid = xatou_range(uid, 0, CONFIG_LAST_ID);
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 3c9ed68..652e4f1 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -61,8 +61,10 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
if (getuid() != 0)
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
- opt_complementary = "m--ec:e--mc:c--em";
- opt = getopt32long(argv, "emc:", chpasswd_longopts, &algo);
+ opt = getopt32long(argv, "^" "emc:" "\0" "m--ec:e--mc:c--em",
+ chpasswd_longopts,
+ &algo
+ );
while ((name = xmalloc_fgetline(stdin)) != NULL) {
char *free_me;
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index c10a0c8..76138a6 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -111,9 +111,10 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv)
opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO;
opt_S = NULL;
/* at most two non-option arguments; -P NUM */
- opt_complementary = "?2";
- getopt32long(argv, "sP:+S:m:a:", mkpasswd_longopts,
- &fd, &opt_S, &opt_m, &opt_m);
+ getopt32long(argv, "^" "sP:+S:m:a:" "\0" "?2",
+ mkpasswd_longopts,
+ &fd, &opt_S, &opt_m, &opt_m
+ );
argv += optind;
/* have no idea how to handle -s... */
diff --git a/loginutils/getty.c b/loginutils/getty.c
index fd5116d..23e92bc 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -131,7 +131,7 @@ struct globals {
//usage: "\n"
//usage: "\nBAUD_RATE of 0 leaves it unchanged"
-static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:+wn";
+#define OPT_STR "I:LH:f:hil:mt:+wn"
#define F_INITSTRING (1 << 0) /* -I */
#define F_LOCAL (1 << 1) /* -L */
#define F_FAKEHOST (1 << 2) /* -H */
@@ -179,8 +179,7 @@ static void parse_args(char **argv)
char *ts;
int flags;
- opt_complementary = "-2"; /* at least 2 args; -t N */
- flags = getopt32(argv, opt_string,
+ flags = getopt32(argv, "^" OPT_STR "\0" "-2"/* at least 2 args*/,
&G.initstring, &G.fakehost, &G.issue,
&G.login, &G.timeout
);
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index bf46d08..9e319fe 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -66,8 +66,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
struct passwd *pw;
pw = xgetpwuid(getuid());
- opt_complementary = "=0"; /* no params! */
- getopt32(argv, "a");
+ getopt32(argv, "^" "a" "\0" "=0"/* no args!*/);
/* Ignore some signals so that we don't get killed by them */
bb_signals(0
generated by cgit v1.1 at 2024-12-24 17:57:06 +0000