svn commit: trunk/busybox: applets coreutils editors include libbb etc...
vda at busybox.net
vda at busybox.net
Tue Oct 3 20:28:07 UTC 2006
Author: vda
Date: 2006-10-03 13:28:06 -0700 (Tue, 03 Oct 2006)
New Revision: 16304
Log:
rename bb_default_error_retval -> xfunc_error_retval
Modified:
trunk/busybox/applets/applets.c
trunk/busybox/coreutils/cmp.c
trunk/busybox/coreutils/env.c
trunk/busybox/coreutils/nice.c
trunk/busybox/coreutils/nohup.c
trunk/busybox/coreutils/sort.c
trunk/busybox/coreutils/tty.c
trunk/busybox/editors/sed.c
trunk/busybox/include/libbb.h
trunk/busybox/libbb/default_error_retval.c
trunk/busybox/libbb/error_msg_and_die.c
trunk/busybox/libbb/fflush_stdout_and_exit.c
trunk/busybox/libbb/herror_msg_and_die.c
trunk/busybox/libbb/perror_msg_and_die.c
trunk/busybox/libbb/xfuncs.c
trunk/busybox/miscutils/crontab.c
trunk/busybox/networking/arping.c
Changeset:
Modified: trunk/busybox/applets/applets.c
===================================================================
--- trunk/busybox/applets/applets.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/applets/applets.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -443,7 +443,7 @@
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)
Modified: trunk/busybox/coreutils/cmp.c
===================================================================
--- trunk/busybox/coreutils/cmp.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/coreutils/cmp.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -31,7 +31,7 @@
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 @@
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);
Modified: trunk/busybox/coreutils/env.c
===================================================================
--- trunk/busybox/coreutils/env.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/coreutils/env.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -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 @@
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);
}
Modified: trunk/busybox/coreutils/nice.c
===================================================================
--- trunk/busybox/coreutils/nice.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/coreutils/nice.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -67,6 +67,6 @@
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);
}
Modified: trunk/busybox/coreutils/nohup.c
===================================================================
--- trunk/busybox/coreutils/nohup.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/coreutils/nohup.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -17,7 +17,7 @@
int temp, nullfd;
char *nohupout, *home = NULL;
- bb_default_error_retval = 127;
+ xfunc_error_retval = 127;
if (argc<2) bb_show_usage();
Modified: trunk/busybox/coreutils/sort.c
===================================================================
--- trunk/busybox/coreutils/sort.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/coreutils/sort.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -225,7 +225,7 @@
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);
Modified: trunk/busybox/coreutils/tty.c
===================================================================
--- trunk/busybox/coreutils/tty.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/coreutils/tty.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -21,7 +21,7 @@
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");
Modified: trunk/busybox/editors/sed.c
===================================================================
--- trunk/busybox/editors/sed.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/editors/sed.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -725,7 +725,7 @@
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);
}
Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/include/libbb.h 2006-10-03 20:28:06 UTC (rev 16304)
@@ -421,7 +421,7 @@
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"
Modified: trunk/busybox/libbb/default_error_retval.c
===================================================================
--- trunk/busybox/libbb/default_error_retval.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/libbb/default_error_retval.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -16,4 +16,4 @@
#include <stdlib.h>
#include "libbb.h"
-int bb_default_error_retval = EXIT_FAILURE;
+int xfunc_error_retval = EXIT_FAILURE;
Modified: trunk/busybox/libbb/error_msg_and_die.c
===================================================================
--- trunk/busybox/libbb/error_msg_and_die.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/libbb/error_msg_and_die.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -24,5 +24,5 @@
va_end(p);
if (die_sleep)
sleep(die_sleep);
- exit(bb_default_error_retval);
+ exit(xfunc_error_retval);
}
Modified: trunk/busybox/libbb/fflush_stdout_and_exit.c
===================================================================
--- trunk/busybox/libbb/fflush_stdout_and_exit.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/libbb/fflush_stdout_and_exit.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -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);
Modified: trunk/busybox/libbb/herror_msg_and_die.c
===================================================================
--- trunk/busybox/libbb/herror_msg_and_die.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/libbb/herror_msg_and_die.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -21,5 +21,5 @@
va_end(p);
if (die_sleep)
sleep(die_sleep);
- exit(bb_default_error_retval);
+ exit(xfunc_error_retval);
}
Modified: trunk/busybox/libbb/perror_msg_and_die.c
===================================================================
--- trunk/busybox/libbb/perror_msg_and_die.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/libbb/perror_msg_and_die.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -22,5 +22,5 @@
va_end(p);
if (die_sleep)
sleep(die_sleep);
- exit(bb_default_error_retval);
+ exit(xfunc_error_retval);
}
Modified: trunk/busybox/libbb/xfuncs.c
===================================================================
--- trunk/busybox/libbb/xfuncs.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/libbb/xfuncs.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -414,7 +414,7 @@
{
// 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);
}
Modified: trunk/busybox/miscutils/crontab.c
===================================================================
--- trunk/busybox/miscutils/crontab.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/miscutils/crontab.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -269,7 +269,7 @@
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);
Modified: trunk/busybox/networking/arping.c
===================================================================
--- trunk/busybox/networking/arping.c 2006-10-03 19:57:50 UTC (rev 16303)
+++ trunk/busybox/networking/arping.c 2006-10-03 20:28:06 UTC (rev 16304)
@@ -295,7 +295,7 @@
target = *argv;
- bb_default_error_retval = 2;
+ xfunc_error_retval = 2;
{
struct ifreq ifr;
More information about the busybox-cvs
mailing list