dd: support conv=swab

[oweals/busybox.git] / coreutils / nice.c

diff --git a/coreutils/nice.c b/coreutils/nice.c
index 293861842cc7f76db5a6199ad9c3b3bcb4daeba4..ce759916faab9931355cb58791e91ad7d7cad74b 100644 (file)
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -4,24 +4,31 @@
  *
  * 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.
  */
 
+//usage:#define nice_trivial_usage
+//usage:       "[-n ADJUST] [PROG ARGS]"
+//usage:#define nice_full_usage "\n\n"
+//usage:       "Change scheduling priority, run PROG\n"
+//usage:     "\n       -n ADJUST       Adjust priority by ADJUST"
+
 #include <sys/resource.h>
-#include "busybox.h"
+#include "libbb.h"
 
+int nice_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nice_main(int argc, char **argv)
 {
        int old_priority, adjustment;
 
        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] == '-') {
                if (argv[0][1] == 'n') { /* -n */
@@ -31,7 +38,7 @@ int nice_main(int argc, char **argv)
                } else { /* -NNN (NNN may be negative) == -n NNN */
                        argv[0] += 1; argv--; argc++;
                }
-               if (argc < 4) {                 /* Missing priority and/or utility! */
+               if (argc < 4) {  /* Missing priority and/or utility! */
                        bb_show_usage();
                }
                adjustment = xatoi_range(argv[1], INT_MIN/2, INT_MAX/2);
@@ -46,9 +53,5 @@ int nice_main(int argc, char **argv)
                }
        }
 
-       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);
 }