diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-05-21 20:30:51 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-05-21 20:30:51 +0000 |
commit | 004015e9c4e8ff98bcbaf955cf42147218204da4 (patch) | |
tree | b6f1eb9281b70d0723d82a68ed090e619dbbf606 /networking/ping.c | |
parent | abec344ab7060d940f133d93b76e6bbe5881e205 (diff) | |
download | busybox-w32-004015e9c4e8ff98bcbaf955cf42147218204da4.tar.gz busybox-w32-004015e9c4e8ff98bcbaf955cf42147218204da4.tar.bz2 busybox-w32-004015e9c4e8ff98bcbaf955cf42147218204da4.zip |
Patch from Lars Kellogg-Stedman <lars@larsshack.org> to fix bug
#1130 (i.e. When you turn on features it should always ADD features)
Diffstat (limited to 'networking/ping.c')
-rw-r--r-- | networking/ping.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/ping.c b/networking/ping.c index 1afcb28b1..e4307d2de 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * $Id: ping.c,v 1.42 2001/05/16 15:52:23 kraai Exp $ | 3 | * $Id: ping.c,v 1.43 2001/05/21 20:30:51 andersen Exp $ |
4 | * Mini ping implementation for busybox | 4 | * Mini ping implementation for busybox |
5 | * | 5 | * |
6 | * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> | 6 | * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> |
@@ -174,7 +174,7 @@ static int in_cksum(unsigned short *buf, int sz) | |||
174 | } | 174 | } |
175 | 175 | ||
176 | /* simple version */ | 176 | /* simple version */ |
177 | #ifdef BB_FEATURE_SIMPLE_PING | 177 | #ifndef BB_FEATURE_FANCY_PING |
178 | static char *hostname = NULL; | 178 | static char *hostname = NULL; |
179 | 179 | ||
180 | static void noresp(int ign) | 180 | static void noresp(int ign) |
@@ -251,7 +251,7 @@ extern int ping_main(int argc, char **argv) | |||
251 | return EXIT_SUCCESS; | 251 | return EXIT_SUCCESS; |
252 | } | 252 | } |
253 | 253 | ||
254 | #else /* ! BB_FEATURE_SIMPLE_PING */ | 254 | #else /* ! BB_FEATURE_FANCY_PING */ |
255 | /* full(er) version */ | 255 | /* full(er) version */ |
256 | static char *hostname = NULL; | 256 | static char *hostname = NULL; |
257 | static struct sockaddr_in pingaddr; | 257 | static struct sockaddr_in pingaddr; |
@@ -534,7 +534,7 @@ extern int ping_main(int argc, char **argv) | |||
534 | ping(*argv); | 534 | ping(*argv); |
535 | return EXIT_SUCCESS; | 535 | return EXIT_SUCCESS; |
536 | } | 536 | } |
537 | #endif /* ! BB_FEATURE_SIMPLE_PING */ | 537 | #endif /* ! BB_FEATURE_FANCY_PING */ |
538 | 538 | ||
539 | /* | 539 | /* |
540 | * Copyright (c) 1989 The Regents of the University of California. | 540 | * Copyright (c) 1989 The Regents of the University of California. |