[git commit master] ping: use |=, not =, when combine option bit mask

Denys Vlasenko vda.linux at googlemail.com
Sat Nov 21 14:44:56 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=85164fa06eac734dd853b7e08c1762ada06e9a2c
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/ping.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/networking/ping.c b/networking/ping.c
index 0ca41b9..c7b6cbe 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -726,7 +726,7 @@ static int common_ping_main(int opt, char **argv)
 
 	/* exactly one argument needed; -v and -q don't mix; -c NUM, -w NUM, -W NUM */
 	opt_complementary = "=1:q--v:v--q:c+:w+:W+";
-	opt = getopt32(argv, OPT_STRING, &pingcount, &str_s, &deadline, &timeout, &str_I);
+	opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &deadline, &timeout, &str_I);
 	if (opt & OPT_s)
 		datalen = xatou16(str_s); // -s
 	if (opt & OPT_I) { // -I
-- 
1.6.3.3



More information about the busybox-cvs mailing list