40920825d

Denis Vlasenko

2006-10-03

SOURCE BUG Duration: 41s

Subject

rename bb_default_error_retval -> xfunc_error_retval

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 →

applets/applets.c +1 -1 coreutils/cmp.c +2 -2 coreutils/env.c +2 -2 coreutils/nice.c +1 -1 coreutils/nohup.c +1 -1 coreutils/sort.c +1 -1 coreutils/tty.c +1 -1 editors/sed.c +1 -1 include/libbb.h +1 -1 libbb/default_error_retval.c +1 -1 libbb/error_msg_and_die.c +1 -1 libbb/fflush_stdout_and_exit.c +1 -1 libbb/herror_msg_and_die.c +1 -1 libbb/perror_msg_and_die.c +1 -1 libbb/xfuncs.c +1 -1 miscutils/crontab.c +1 -1 networking/arping.c +1 -1

applets/applets.c+1 -1

@@ -443,7 +443,7 @@ void bb_show_usage(void)
	applet_using->name, usage_string);
	}

-	exit (bb_default_error_retval);
+	exit(xfunc_error_retval);
	}

	static int applet_name_compare(const void name, const void vapplet)

coreutils/cmp.c+2 -2

@@ -31,7 +31,7 @@ static FILE cmp_xfopen_input(const char const filename)
	return fp;
	}

-	exit(bb_default_error_retval); /* We already output an error message. */
+	exit(xfunc_error_retval); /* We already output an error message. */
	}

	static const char fmt_eof[] = "cmp: EOF on %s\n";
@@ -52,7 +52,7 @@ int cmp_main(int argc, char **argv)
	unsigned opt;
	int retval = 0;

-	bb_default_error_retval = 2; /* 1 is returned if files are different. */
+	xfunc_error_retval = 2; /* 1 is returned if files are different. */

	opt = bb_getopt_ulflags(argc, argv, opt_chars);

coreutils/env.c+2 -2

@@ -26,7 +26,7 @@
	* - correct "-" option usage
	* - multiple "-u unsetenv" support
	* - GNU long option support
-	* - use bb_default_error_retval
+	* - use xfunc_error_retval
	*/

	#include "busybox.h"
@@ -82,7 +82,7 @@ int env_main(int argc, char** argv)
	if (*argv) {
	execvp(*argv, argv);
	/* SUSv3-mandated exit codes. */
-	bb_default_error_retval = (errno == ENOENT) ? 127 : 126;
+	xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
	bb_perror_msg_and_die("%s", *argv);
	}

coreutils/nice.c+1 -1

@@ -67,6 +67,6 @@ int nice_main(int argc, char **argv)
	execvp(argv, argv); / Now exec the desired program. */

	/* The exec failed... */
-	bb_default_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
+	xfunc_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
	bb_perror_msg_and_die("%s", *argv);
	}

coreutils/nohup.c+1 -1

@@ -17,7 +17,7 @@ int nohup_main(int argc, char **argv)
	int temp, nullfd;
	char nohupout, home = NULL;

-	bb_default_error_retval = 127;
+	xfunc_error_retval = 127;

	if (argc<2) bb_show_usage();

coreutils/sort.c+1 -1

@@ -225,7 +225,7 @@ int sort_main(int argc, char **argv)
	char line,lines=NULL,optlist="ngMucszbrdfimS:T:o:k:t:";
	int c;

-	bb_default_error_retval = 2;
+	xfunc_error_retval = 2;
	/* Parse command line options */
	while((c=getopt(argc,argv,optlist))>0) {
	line=strchr(optlist,c);

coreutils/tty.c+1 -1

@@ -21,7 +21,7 @@ int tty_main(int argc, char **argv)
	int silent; /* Note: No longer relevant in SUSv3. */
	int retval;

-	bb_default_error_retval = 2; /* SUSv3 requires > 1 for error. */
+	xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */

	silent = bb_getopt_ulflags(argc, argv, "s");

editors/sed.c+1 -1

@@ -725,7 +725,7 @@ static int puts_maybe_newline(char s, FILE file, int missing_newline, int no_n
	if(!no_newline) fputc('\n',file);

	if(ferror(file)) {
-	bb_default_error_retval = 4; /* It's what gnu sed exits with... */
+	xfunc_error_retval = 4; /* It's what gnu sed exits with... */
	bb_error_msg_and_die(bb_msg_write_error);
	}

include/libbb.h+1 -1

@@ -421,7 +421,7 @@ extern const char bb_default_login_shell[];

	extern const char bb_path_mtab_file[];

-	extern int bb_default_error_retval;
+	extern int xfunc_error_retval;

	#ifdef CONFIG_FEATURE_DEVFS
	# define CURRENT_VC "/dev/vc/0"

libbb/default_error_retval.c+1 -1

@@ -16,4 +16,4 @@
	#include <stdlib.h>
	#include "libbb.h"

-	int bb_default_error_retval = EXIT_FAILURE;
+	int xfunc_error_retval = EXIT_FAILURE;

libbb/error_msg_and_die.c+1 -1

@@ -24,5 +24,5 @@ void bb_error_msg_and_die(const char *s, ...)
	va_end(p);
	if (die_sleep)
	sleep(die_sleep);
-	exit(bb_default_error_retval);
+	exit(xfunc_error_retval);
	}

libbb/fflush_stdout_and_exit.c+1 -1

@@ -18,7 +18,7 @@
	void bb_fflush_stdout_and_exit(int retval)
	{
	if (fflush(stdout)) {
-	retval = bb_default_error_retval;
+	retval = xfunc_error_retval;
	}
	if (die_sleep)
	sleep(die_sleep);

libbb/herror_msg_and_die.c+1 -1

@@ -21,5 +21,5 @@ void bb_herror_msg_and_die(const char *s, ...)
	va_end(p);
	if (die_sleep)
	sleep(die_sleep);
-	exit(bb_default_error_retval);
+	exit(xfunc_error_retval);
	}

libbb/perror_msg_and_die.c+1 -1

@@ -22,5 +22,5 @@ void bb_perror_msg_and_die(const char *s, ...)
	va_end(p);
	if (die_sleep)
	sleep(die_sleep);
-	exit(bb_default_error_retval);
+	exit(xfunc_error_retval);
	}

libbb/xfuncs.c+1 -1

@@ -414,7 +414,7 @@ void xprint_and_close_file(FILE *file)
	{
	// copyfd outputs error messages for us.
	if (bb_copyfd_eof(fileno(file), 1) == -1)
-	exit(bb_default_error_retval);
+	exit(xfunc_error_retval);

	fclose(file);
	}

miscutils/crontab.c+1 -1

@@ -269,7 +269,7 @@ static int GetReplaceStream(const char user, const char file)
	if (ChangeUser(user, 0) < 0)
	exit(0);

-	bb_default_error_retval = 0;
+	xfunc_error_retval = 0;
	fd = xopen(file, O_RDONLY);
	buf[0] = 0;
	write(filedes[1], buf, 1);

networking/arping.c+1 -1

@@ -295,7 +295,7 @@ int arping_main(int argc, char **argv)

	target = *argv;

-	bb_default_error_retval = 2;
+	xfunc_error_retval = 2;

	{
	struct ifreq ifr;