c30f445b0

Rob Landley

2006-03-20

SOURCE BUG Duration: 19s

Subject

Patch from tito, acked by Bernhard Fischer.

SOURCE BUG

This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

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

—

Build Log

(log yok)

Commit Diff GitHub →

util-linux/Config.in +10 -0 util-linux/setarch.c +7 -8

util-linux/Config.in+10 -0

@@ -354,9 +354,19 @@ config CONFIG_READPROFILE
	help
	This allows you to parse /proc/profile for basic profiling.

+	config CONFIG_LINUX32
+	default n
+	depends on CONFIG_SETARCH
+
+	config CONFIG_LINUX64
+	default n
+	depends on CONFIG_SETARCH
+
	config CONFIG_SETARCH
	bool "setarch"
	default n
+	select CONFIG_LINUX32
+	select CONFIG_LINUX64
	help
	The linux32 utility is used to create a 32bit environment for the
	specified program (usually a shell). It only makes sense to have

util-linux/setarch.c+7 -8

@@ -16,7 +16,7 @@

	#include "busybox.h"

-	int setarch_main(int argc, char **argv)
+	int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv)
	{
	int pers = -1;

@@ -26,9 +26,9 @@ int setarch_main(int argc, char **argv)
	* argv[0] -> "personality"
	*/
	retry:
-	if (!strcmp(argv[0], "linux64"))
+	if (argv[0][5] == '6') /* linux64 */
	pers = PER_LINUX;
-	else if (!strcmp(argv[0], "linux32"))
+	else if (argv[0][5] == '3') /* linux32 */
	pers = PER_LINUX32;
	else if (pers == -1 && argv[1] != NULL) {
	pers = PER_LINUX32;
@@ -42,12 +42,11 @@ retry:
	bb_show_usage();

	/* Try to set personality */
-	if (personality(pers) < 0)
-	goto failure;
+	if (personality(pers) >= 0) {

-	/* Try to execute the program */
-	execvp(argv[0], argv);
+	/* Try to execute the program */
+	execvp(argv[0], argv);
+	}

-	failure:
	bb_perror_msg_and_die("%s", argv[0]);
	}