[git commit branch/1_28_stable] tcpsvd: fix fallout from opt_complementary removal
Denys Vlasenko
vda.linux at googlemail.com
Sun Mar 11 22:04:05 UTC 2018
commit: https://git.busybox.net/busybox/commit/?id=c74f1d2cb48c6a9216ea901178e43c02ac7da0dc
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/1_28_stable
text data bss dec hex filename
933035 473 6836 940344 e5938 busybox_old
933051 473 6836 940360 e5948 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
networking/tcpudp.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index d4c69e0f7..51c59e118 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -269,17 +269,22 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
tcp = (applet_name[0] == 't');
+ /* "+": stop on first non-option */
#ifdef SSLSVD
opts = getopt32(argv, "^+"
"c:+C:i:x:u:l:Eb:+hpt:vU:/:Z:K:" /* -c NUM, -b NUM */
+ "\0"
/* 3+ args, -i at most once, -p implies -h, -v is a counter */
- "\0" "-3:i--i:ph:vv",
+ "-3:i--i:ph:vv",
&cmax, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
&backlog, &str_t, &ssluser, &root, &cert, &key, &verbose
);
#else
- /* "+": stop on first non-option */
- opts = getopt32(argv, "+c:+C:i:x:u:l:Eb:hpt:v",
+ opts = getopt32(argv, "^+"
+ "c:+C:i:x:u:l:Eb:+hpt:v" /* -c NUM, -b NUM */
+ "\0"
+ /* 3+ args, -i at most once, -p implies -h, -v is a counter */
+ "-3:i--i:ph:vv",
&cmax, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
&backlog, &str_t, &verbose
);
More information about the busybox-cvs
mailing list