6 files changed, 8 insertions, 8 deletions

diff --git a/coreutils/cmp.c b/coreutils/cmp.c
index d26c3db8c..d0d976997 100644
--- a/coreutils/cmp.c
+++ b/coreutils/cmp.c
@@ -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);
 
diff --git a/coreutils/env.c b/coreutils/env.c
index b42d90435..2af15a37e 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -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);
         }
 
diff --git a/coreutils/nice.c b/coreutils/nice.c
index ad0178b7f..4c54dddbb 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -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);
 }
diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index cf8ad2cd4..439fbb173 100644
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -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();
 
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 7dfe1764c..c450cfbe6 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -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);
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 924aff2d5..eb8c3dd0f 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -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");