Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/nice.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/nice.c (modified) (5 diffs)

branches/2.2.9/mindi-busybox/coreutils/nice.c

@@ -5 +5 @@
  * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -11 +11 @@
 #include "libbb.h"
 
-int nice_main(int argc, char **argv);
+int nice_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nice_main(int argc, char **argv)
 {
@@ -18 +18 @@
     old_priority = getpriority(PRIO_PROCESS, 0);
 
-    if (!*++argv) { /* No args, so (GNU) output current nice value. */
+    if (!*++argv) { /* No args, so (GNU) output current nice value. */
         printf("%d\n", old_priority);
         fflush_stdout_and_exit(EXIT_SUCCESS);
     }
 
-    adjustment = 10;            /* Set default adjustment. */
+    adjustment = 10;  /* Set default adjustment. */
 
     if (argv[0][0] == '-') {
@@ -33 +33 @@
             argv[0] += 1; argv--; argc++;
         }
-        if (argc < 4) {         /* Missing priority and/or utility! */
+        if (argc < 4) {  /* Missing priority and/or utility! */
             bb_show_usage();
         }
@@ -48 +48 @@
     }
 
-    BB_EXECVP(*argv, argv);     /* Now exec the desired program. */
-
-    /* The exec failed... */
-    xfunc_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
-    bb_perror_msg_and_die("%s", *argv);
+    BB_EXECVP_or_die(argv);
 }