316355524

Denis Vlasenko

2007-01-20

FAILED Duration: 3s

Subject

fixing bugs revealed by randomconfig runs

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

include/applets.h+2 -0

@@ -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_TELNETD(APPLET(telnetd, _BB_DIR_USR_SBIN, _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))
+	#endif
	USE_TIME(APPLET(time, _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))

networking/nc.c+1 -1

@@ -23,8 +23,8 @@ int nc_main(int argc, char **argv)
	/* sfd sits _here_ only because of "repeat" option (-l -l). */
	int sfd = sfd; /* for gcc */
	int cfd = 0;
+	unsigned lport = 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 delay = 0;
	SKIP_NC_EXTRA (const int execparam = 0;)

networking/tftp.c+6 -2

@@ -22,6 +22,8 @@
	#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_TIMEOUT 5 /* seconds */
	#define TFTP_NUM_RETRIES 5 /* number of retries */
@@ -56,8 +58,8 @@ static const char *const tftp_bb_error_msg[] = {
	#else
	#define USE_GETPUT(a) a
	/* masks coming from getpot32 */
-	#define CMD_GET(cmd) (cmd & 1)
-	#define CMD_PUT(cmd) (cmd & 2)
+	#define CMD_GET(cmd) ((cmd) & 1)
+	#define CMD_PUT(cmd) ((cmd) & 2)
	#endif
	/* NB: in the code below
	* CMD_GET(cmd) and CMD_GET(cmd) are mutually exclusive
@@ -508,3 +510,5 @@ int tftp_main(int argc, char **argv)
	}
	return result;
	}
+
+	#endif /* ENABLE_FEATURE_TFTP_GET \|\| ENABLE_FEATURE_TFTP_PUT */