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

fixing bugs revealed by randomconfig runs

Browse Source
This commit is contained in:
Denis Vlasenko 2007-01-20 16:54:19 +00:00
parent 91f20ab510
commit 316355524f
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/applets.h
View File

@ -287,7 +287,9 @@ USE_TEE(APPLET(tee, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TELNET(APPLET(telnet, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_TELNET(APPLET(telnet, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TELNETD(APPLET(telnetd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_TELNETD(APPLET(telnetd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
USE_TEST(APPLET(test, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_TEST(APPLET(test, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
USE_TFTP(APPLET(tftp, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_TFTP(APPLET(tftp, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
#endif
USE_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TOUCH(APPLET(touch, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_TOUCH(APPLET(touch, _BB_DIR_BIN, _BB_SUID_NEVER))

2
networking/nc.c
View File

@ -23,8 +23,8 @@ int nc_main(int argc, char **argv)
/* sfd sits _here_ only because of "repeat" option (-l -l). */ /* sfd sits _here_ only because of "repeat" option (-l -l). */
int sfd = sfd; /* for gcc */ int sfd = sfd; /* for gcc */
int cfd = 0; int cfd = 0;
unsigned lport = 0;
SKIP_NC_SERVER(const) unsigned do_listen = 0; SKIP_NC_SERVER(const) unsigned do_listen = 0;
SKIP_NC_SERVER(const) unsigned lport = 0;
SKIP_NC_EXTRA (const) unsigned wsecs = 0; SKIP_NC_EXTRA (const) unsigned wsecs = 0;
SKIP_NC_EXTRA (const) unsigned delay = 0; SKIP_NC_EXTRA (const) unsigned delay = 0;
SKIP_NC_EXTRA (const int execparam = 0;) SKIP_NC_EXTRA (const int execparam = 0;)

8
networking/tftp.c
View File

@ -22,6 +22,8 @@
#include "busybox.h" #include "busybox.h"
#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
#define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */ #define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */
#define TFTP_TIMEOUT 5 /* seconds */ #define TFTP_TIMEOUT 5 /* seconds */
#define TFTP_NUM_RETRIES 5 /* number of retries */ #define TFTP_NUM_RETRIES 5 /* number of retries */
@ -56,8 +58,8 @@ static const char *const tftp_bb_error_msg[] = {
#else #else
#define USE_GETPUT(a) a #define USE_GETPUT(a) a
/* masks coming from getpot32 */ /* masks coming from getpot32 */
#define CMD_GET(cmd) (cmd & 1) #define CMD_GET(cmd) ((cmd) & 1)
#define CMD_PUT(cmd) (cmd & 2) #define CMD_PUT(cmd) ((cmd) & 2)
#endif #endif
/* NB: in the code below /* NB: in the code below
* CMD_GET(cmd) and CMD_GET(cmd) are mutually exclusive * CMD_GET(cmd) and CMD_GET(cmd) are mutually exclusive
@ -508,3 +510,5 @@ int tftp_main(int argc, char **argv)
} }
return result; return result;
} }
#endif /* ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT */