aboutsummaryrefslogtreecommitdiff
path: root/networking/tftp.c
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-20 16:54:19 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-20 16:54:19 +0000
commitf0c5f402185af4de0a3dd6093cd88df1ffff261d (patch)
treed6fbd44c510bef0ebf57cd81bee8e009040fa3f4 /networking/tftp.c
parent0279a535083908d1f6cf83c69adc322d7a587410 (diff)
downloadbusybox-w32-f0c5f402185af4de0a3dd6093cd88df1ffff261d.tar.gz
busybox-w32-f0c5f402185af4de0a3dd6093cd88df1ffff261d.tar.bz2
busybox-w32-f0c5f402185af4de0a3dd6093cd88df1ffff261d.zip
fixing bugs revealed by randomconfig runs
git-svn-id: svn://busybox.net/trunk/busybox@17397 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to '')
-rw-r--r--networking/tftp.c8
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 */