ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename bb_default_error_retval -> xfunc_error_retval

Browse source
This commit is contained in:
Denis Vlasenko 2006-10-03 20:28:06 +00:00
parent b6332248ca
commit 40920825d5
17 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
coreutils/cmp.c
View file

@ -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);

4
coreutils/env.c
View file

@ -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);
}

2
coreutils/nice.c
View file

@ -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);
}

2
coreutils/nohup.c
View file

@ -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();

2
coreutils/sort.c
View file

@ -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);

2
coreutils/tty.c
View file

@ -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");