X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=miscutils%2Fionice.c;h=bd300605fd3ef3c4d06a060a9b7310bcf55ca920;hb=45dc96c8a6dce3aeea983f6c32572d4cee646b5d;hp=88d771c30970c5ea7f7b30f12f1ee590e4febb66;hpb=4acdb46ff17a3dd966ddccdc149cda5a18d51a48;p=oweals%2Fbusybox.git

diff --git a/miscutils/ionice.c b/miscutils/ionice.c
index 88d771c30..bd300605f 100644
--- a/miscutils/ionice.c
+++ b/miscutils/ionice.c
@@ -4,9 +4,16 @@
  *
  * Copyright (C) 2008 by  <u173034@informatik.uni-oldenburg.de>
  *
- * 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 ionice_trivial_usage
+//usage:	"[-c 1-3] [-n 0-7] [-p PID] [PROG]"
+//usage:#define ionice_full_usage "\n\n"
+//usage:       "Change I/O priority and class\n"
+//usage:     "\n	-c	Class. 1:realtime 2:best-effort 3:idle"
+//usage:     "\n	-n	Priority"
+
 #include <sys/syscall.h>
 #include <asm/unistd.h>
 #include "libbb.h"
@@ -57,7 +64,7 @@ int ionice_main(int argc UNUSED_PARAM, char **argv)
 	/* '+': stop at first non-option */
 	opt = getopt32(argv, "+n:c:p:", &pri, &ioclass, &pid);
 	argv += optind;
-	
+
 	if (opt & OPT_c) {
 		if (ioclass > 3)
 			bb_error_msg_and_die("bad class %d", ioclass);
@@ -70,10 +77,10 @@ int ionice_main(int argc UNUSED_PARAM, char **argv)
 //			pri = 7;
 //		}
 	}
-	
+
 	if (!(opt & (OPT_n|OPT_c))) {
 		if (!(opt & OPT_p) && *argv)
-			pid = xatoi_u(*argv);
+			pid = xatoi_positive(*argv);
 
 		pri = ioprio_get(IOPRIO_WHO_PROCESS, pid);
 		if (pri == -1)
@@ -89,9 +96,8 @@ int ionice_main(int argc UNUSED_PARAM, char **argv)
 		pri |= (ioclass << IOPRIO_CLASS_SHIFT);
 		if (ioprio_set(IOPRIO_WHO_PROCESS, pid, pri) == -1)
 			bb_perror_msg_and_die("ioprio_%cet", 's');
-		if (*argv) {
-			BB_EXECVP(*argv, argv);
-			bb_simple_perror_msg_and_die(*argv);
+		if (argv[0]) {
+			BB_EXECVP_or_die(argv);
 		}
 	}