658d2cf98

Rob Landley

2005-09-08

SOURCE BUG Duration: 6s

Subject

Tito sent in a few patches converting instances of CONFIG_FEATURE_CLEAN_UP to ENABLE_FEATURE_CLEAN_UP.

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 →

miscutils/strings.c +3 -3 util-linux/fdflush.c +4 -4 util-linux/fdformat.c +6 -6 util-linux/freeramdisk.c +3 -3

miscutils/strings.c+3 -3

@@ -99,9 +99,9 @@ PIPE:
	status=EXIT_FAILURE;
	}
	} while ( --argc > 0 );
-	#ifdef CONFIG_FEATURE_CLEAN_UP
-	free(string);
-	#endif
+
+	if (ENABLE_FEATURE_CLEAN_UP) free(string);
+
	bb_fflush_stdout_and_exit(status);
	}

util-linux/fdflush.c+4 -4

@@ -35,15 +35,15 @@ extern int fdflush_main(int argc, char **argv)
	{
	int fd, result;

-	if (argc <= 1)
+	if (argc != 2)
	bb_show_usage();

	fd = bb_xopen(argv[1], 0);

	result = ioctl(fd, FDFLUSH, 0);
-	#ifdef CONFIG_FEATURE_CLEAN_UP
-	close(fd);
-	#endif
+
+	if (ENABLE_FEATURE_CLEAN_UP) close(fd);
+
	if (result) {
	bb_perror_nomsg_and_die();
	}

util-linux/fdformat.c+6 -6

@@ -147,14 +147,14 @@ int fdformat_main(int argc,char **argv)
	/* There is no point in freeing blocks at the end of a program, because
	all of the program's space is given back to the system when the process
	terminates.*/
-	#ifdef CONFIG_FEATURE_CLEAN_UP
-	free(data);
-	#endif
+
+	if (ENABLE_FEATURE_CLEAN_UP) free(data);
+
	print_and_flush("done\n", NULL);
	}
-	#ifdef CONFIG_FEATURE_CLEAN_UP
-	close(fd);
-	#endif
+
+	if (ENABLE_FEATURE_CLEAN_UP) close(fd);
+
	/* Don't bother closing. Exit does
	* that, so we can save a few bytes */
	return EXIT_SUCCESS;

util-linux/freeramdisk.c+3 -3

@@ -47,9 +47,9 @@ freeramdisk_main(int argc, char **argv)
	fd = bb_xopen(argv[1], O_RDWR);

	result = ioctl(fd, BLKFLSBUF);
-	#ifdef CONFIG_FEATURE_CLEAN_UP
-	close(fd);
-	#endif
+
+	if (ENABLE_FEATURE_CLEAN_UP) close(fd);
+
	if (result < 0) {
	bb_perror_msg_and_die("failed ioctl on %s", argv[1]);
	}