ntpd: default to FEATURE_NTP_AUTH=y

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

diff --git a/coreutils/nice.c b/coreutils/nice.c
index e30242ffa847fa9ec91189666b052c908b413e20..da1696c4201e41b9e5c2229e752faa9425b9b502 100644 (file)
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -10,9 +10,9 @@
 //config:      bool "nice (1.8 kb)"
 //config:      default y
 //config:      help
-//config:        nice runs a program with modified scheduling priority.
+//config:      nice runs a program with modified scheduling priority.
 
-//applet:IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_NICE(APPLET_NOEXEC(nice, nice, BB_DIR_BIN, BB_SUID_DROP, nice))
 
 //kbuild:lib-$(CONFIG_NICE) += nice.o
 
@@ -22,11 +22,10 @@
 //usage:       "Change scheduling priority, run PROG\n"
 //usage:     "\n       -n ADJUST       Adjust priority by ADJUST"
 
-#include <sys/resource.h>
 #include "libbb.h"
 
 int nice_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int nice_main(int argc, char **argv)
+int nice_main(int argc UNUSED_PARAM, char **argv)
 {
        int old_priority, adjustment;
 
@@ -40,18 +39,21 @@ int nice_main(int argc, char **argv)
        adjustment = 10;  /* Set default adjustment. */
 
        if (argv[0][0] == '-') {
-               if (argv[0][1] == 'n') { /* -n */
-                       if (argv[0][2]) { /* -nNNNN (w/o space) */
-                               argv[0] += 2; argv--; argc++;
+               char *nnn = argv[0] + 1;
+               if (nnn[0] == 'n') { /* -n */
+                       nnn += 1;
+                       if (!nnn[0]) { /* "-n NNN" */
+                               nnn = *++argv;
                        }
-               } else { /* -NNN (NNN may be negative) == -n NNN */
-                       argv[0] += 1; argv--; argc++;
+                       /* else: "-nNNN" (w/o space) */
                }
-               if (argc < 4) {  /* Missing priority and/or utility! */
+               /* else: "-NNN" (NNN may be negative) - same as "-n NNN" */
+
+               if (!nnn || !argv[1]) {  /* Missing priority or PROG! */
                        bb_show_usage();
                }
-               adjustment = xatoi_range(argv[1], INT_MIN/2, INT_MAX/2);
-               argv += 2;
+               adjustment = xatoi_range(nnn, INT_MIN/2, INT_MAX/2);
+               argv++;
        }
 
        {  /* Set our priority. */