emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ping6: do not play dirty tricks with argv

Browse Source 
function                                             old     new   delta
common_ping_main                                       -     368    +368
ping6_main                                            30      14     -16
ping_main                                            370      11    -359
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/2 up/down: 368/-375)           Total: -7 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2009-11-20 18:12:12 +01:00
parent 8684cbb5cc
commit ad7d94bdc7
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
networking/ping.c
View File

@@ -30,13 +30,13 @@
#include "libbb.h" #include "libbb.h"
#if ENABLE_PING6 #if ENABLE_PING6
#include <netinet/icmp6.h> # include <netinet/icmp6.h>
/* I see RENUMBERED constants in bits/in.h - !!? /* I see RENUMBERED constants in bits/in.h - !!?
* What a fuck is going on with libc? Is it a glibc joke? */ * What a fuck is going on with libc? Is it a glibc joke? */
#ifdef IPV6_2292HOPLIMIT # ifdef IPV6_2292HOPLIMIT
#undef IPV6_HOPLIMIT # undef IPV6_HOPLIMIT
#define IPV6_HOPLIMIT IPV6_2292HOPLIMIT # define IPV6_HOPLIMIT IPV6_2292HOPLIMIT
#endif # endif
#endif #endif
enum { enum {
@@ -173,13 +173,14 @@ static void ping6(len_and_sockaddr *lsa)
} }
#endif #endif
int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; #if !ENABLE_PING6
int ping_main(int argc UNUSED_PARAM, char **argv) # define common_ping_main(af, argv) common_ping_main(argv)
#endif
static int common_ping_main(sa_family_t af, char **argv)
{ {
len_and_sockaddr *lsa; len_and_sockaddr *lsa;
#if ENABLE_PING6
sa_family_t af = AF_UNSPEC;
#if ENABLE_PING6
while ((++argv)[0] && argv[0][0] == '-') { while ((++argv)[0] && argv[0][0] == '-') {
if (argv[0][1] == '4') { if (argv[0][1] == '4') {
af = AF_INET; af = AF_INET;
@@ -716,12 +717,10 @@ static void ping(len_and_sockaddr *lsa)
ping4(lsa); ping4(lsa);
} }
int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; static int common_ping_main(int opt, char **argv)
int ping_main(int argc UNUSED_PARAM, char **argv)
{ {
len_and_sockaddr *lsa; len_and_sockaddr *lsa;
char *str_s; char *str_s;
int opt;
INIT_G(); INIT_G();
@@ -765,13 +764,25 @@ int ping_main(int argc UNUSED_PARAM, char **argv)
#endif /* FEATURE_FANCY_PING */ #endif /* FEATURE_FANCY_PING */
int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ping_main(int argc UNUSED_PARAM, char **argv)
{
#if !ENABLE_FEATURE_FANCY_PING
return common_ping_main(AF_UNSPEC, argv);
#else
return common_ping_main(0, argv);
#endif
}
#if ENABLE_PING6 #if ENABLE_PING6
int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ping6_main(int argc UNUSED_PARAM, char **argv) int ping6_main(int argc UNUSED_PARAM, char **argv)
{ {
argv[0] = (char*)"-6"; # if !ENABLE_FEATURE_FANCY_PING
return ping_main(0 /* argc+1 - but it's unused anyway */, return common_ping_main(AF_INET6, argv);
argv - 1); # else
return common_ping_main(OPT_IPV6, argv);
# endif
} }
#endif #endif