diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-20 16:54:19 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-20 16:54:19 +0000 |
commit | 316355524f5fa14f18395c06d4dc813ffa97d47b (patch) | |
tree | d6fbd44c510bef0ebf57cd81bee8e009040fa3f4 /networking/tftp.c | |
parent | 91f20ab510a6ddab49dd89f8c8876912d4537be0 (diff) | |
download | busybox-w32-316355524f5fa14f18395c06d4dc813ffa97d47b.tar.gz busybox-w32-316355524f5fa14f18395c06d4dc813ffa97d47b.tar.bz2 busybox-w32-316355524f5fa14f18395c06d4dc813ffa97d47b.zip |
fixing bugs revealed by randomconfig runs
Diffstat (limited to 'networking/tftp.c')
-rw-r--r-- | networking/tftp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/networking/tftp.c b/networking/tftp.c index 9aa87d57e..eb192d8fc 100644 --- a/networking/tftp.c +++ b/networking/tftp.c | |||
@@ -22,6 +22,8 @@ | |||
22 | #include "busybox.h" | 22 | #include "busybox.h" |
23 | 23 | ||
24 | 24 | ||
25 | #if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT | ||
26 | |||
25 | #define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */ | 27 | #define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */ |
26 | #define TFTP_TIMEOUT 5 /* seconds */ | 28 | #define TFTP_TIMEOUT 5 /* seconds */ |
27 | #define TFTP_NUM_RETRIES 5 /* number of retries */ | 29 | #define TFTP_NUM_RETRIES 5 /* number of retries */ |
@@ -56,8 +58,8 @@ static const char *const tftp_bb_error_msg[] = { | |||
56 | #else | 58 | #else |
57 | #define USE_GETPUT(a) a | 59 | #define USE_GETPUT(a) a |
58 | /* masks coming from getpot32 */ | 60 | /* masks coming from getpot32 */ |
59 | #define CMD_GET(cmd) (cmd & 1) | 61 | #define CMD_GET(cmd) ((cmd) & 1) |
60 | #define CMD_PUT(cmd) (cmd & 2) | 62 | #define CMD_PUT(cmd) ((cmd) & 2) |
61 | #endif | 63 | #endif |
62 | /* NB: in the code below | 64 | /* NB: in the code below |
63 | * CMD_GET(cmd) and CMD_GET(cmd) are mutually exclusive | 65 | * CMD_GET(cmd) and CMD_GET(cmd) are mutually exclusive |
@@ -508,3 +510,5 @@ int tftp_main(int argc, char **argv) | |||
508 | } | 510 | } |
509 | return result; | 511 | return result; |
510 | } | 512 | } |
513 | |||
514 | #endif /* ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT */ | ||