Commit e616c68a authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

busybox: bump 1.14.x version

parent e61606ad
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ config BR2_BUSYBOX_VERSION
	string
	default "1.12.4"	if BR2_BUSYBOX_VERSION_1_12_X
	default "1.13.4"	if BR2_BUSYBOX_VERSION_1_13_X
	default "1.14.1"	if BR2_BUSYBOX_VERSION_1_14_X
	default "1.14.2"	if BR2_BUSYBOX_VERSION_1_14_X

config BR2_PACKAGE_BUSYBOX_FULLINSTALL
	bool "Run BusyBox's own full installation"
+0 −13
Original line number Diff line number Diff line
diff -urpN busybox-1.14.1/shell/ash.c busybox-1.14.1-ash/shell/ash.c
--- busybox-1.14.1/shell/ash.c	2009-05-27 18:00:23.000000000 +0200
+++ busybox-1.14.1-ash/shell/ash.c	2009-06-14 19:44:24.000000000 +0200
@@ -11909,7 +11909,8 @@ find_dot_file(char *name)
 			 */
 			return fullname;
 		}
-		stunalloc(fullname);
+		if (fullname != name)
+			stunalloc(fullname);
 	}
 
 	/* not found in the PATH */
+0 −22
Original line number Diff line number Diff line
diff -urpN busybox-1.14.1/networking/ftpd.c busybox-1.14.1-ftpd/networking/ftpd.c
--- busybox-1.14.1/networking/ftpd.c	2009-05-27 18:00:23.000000000 +0200
+++ busybox-1.14.1-ftpd/networking/ftpd.c	2009-06-04 18:59:49.000000000 +0200
@@ -1320,6 +1320,8 @@ int ftpd_main(int argc UNUSED_PARAM, cha
 				handle_appe();
 			else if (cmdval == const_STOU) /* "store unique" */
 				handle_stou();
+			else
+				goto bad_cmd;
 		}
 #endif
 #if 0
@@ -1340,6 +1342,9 @@ int ftpd_main(int argc UNUSED_PARAM, cha
 			 * (doesn't necessarily mean "we must support them")
 			 * foo 1.2.3: XXXX - comment
 			 */
+#if ENABLE_FEATURE_FTP_WRITE
+ bad_cmd:
+#endif
 			cmdio_write_raw(STR(FTP_BADCMD)" Unknown command\r\n");
 		}
 	}
+0 −655

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −132

File deleted.

Preview size limit exceeded, changes collapsed.

Loading