X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fnice.c;h=d24a95b45f85ed3763b370e47b3bba4c1ca662b3;hb=6b1e3d7e734f85a08c2e4414764f03a7f880b3e6;hp=e8cee6cefc44f2d81f90b723c4393d5d0c4ea842;hpb=299a6b4d7bf40c30e4a52ee8311c17ffd42b3035;p=oweals%2Fbusybox.git

diff --git a/coreutils/nice.c b/coreutils/nice.c
index e8cee6cef..d24a95b45 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -4,82 +4,52 @@
  *
  * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <unistd.h>
 #include <sys/resource.h>
-#include "busybox.h"
-
-static inline int int_add_no_wrap(int a, int b)
-{
-	int s = a + b;
-
-	if (b < 0) {
-		if (s > a) s = INT_MIN;
-	} else {
-		if (s < a) s = INT_MAX;
-	}
-
-	return s;
-}
+#include "libbb.h"
 
+int nice_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nice_main(int argc, char **argv)
 {
-	static const char Xetpriority_msg[] = "cannot %cet priority";
-
 	int old_priority, adjustment;
 
-	errno = 0;			 /* Needed for getpriority error detection. */
 	old_priority = getpriority(PRIO_PROCESS, 0);
-	if (errno) {
-		bb_perror_msg_and_die(Xetpriority_msg, 'g');
-	}
 
 	if (!*++argv) {	/* No args, so (GNU) output current nice value. */
-		bb_printf("%d\n", old_priority);
-		bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+		printf("%d\n", old_priority);
+		fflush_stdout_and_exit(EXIT_SUCCESS);
 	}
 
 	adjustment = 10;			/* Set default adjustment. */
 
-	if ((argv[0][0] == '-') && (argv[0][1] == 'n') && !argv[0][2]) { /* "-n" */
+	if (argv[0][0] == '-') {
+		if (argv[0][1] == 'n') { /* -n */
+			if (argv[0][2]) { /* -nNNNN (w/o space) */
+				argv[0] += 2; argv--; argc++;
+			}
+		} else { /* -NNN (NNN may be negative) == -n NNN */
+			argv[0] += 1; argv--; argc++;
+		}
 		if (argc < 4) {			/* Missing priority and/or utility! */
 			bb_show_usage();
 		}
-		adjustment = bb_xgetlarg(argv[1], 10, INT_MIN, INT_MAX);
+		adjustment = xatoi_range(argv[1], INT_MIN/2, INT_MAX/2);
 		argv += 2;
 	}
 
-	{  /* Set our priority.  Handle integer wrapping for old + adjust. */
-		int new_priority = int_add_no_wrap(old_priority, adjustment);
+	{  /* Set our priority. */
+		int prio = old_priority + adjustment;
 
-		if (setpriority(PRIO_PROCESS, 0, new_priority) < 0) {
-			bb_perror_msg_and_die(Xetpriority_msg, 's');
+		if (setpriority(PRIO_PROCESS, 0, prio) < 0) {
+			bb_perror_msg_and_die("setpriority(%d)", prio);
 		}
 	}
 
-	execvp(*argv, argv);		/* Now exec the desired program. */
+	BB_EXECVP(*argv, argv);		/* Now exec the desired program. */
 
 	/* The exec failed... */
-	bb_default_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
-	bb_perror_msg_and_die("%s", *argv);
+	xfunc_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
+	bb_simple_perror_msg_and_die(*argv);
 }