From: WanBingjiang <wanbingjiang@webray.com.cn>
Date: Thu, 23 Apr 2026 09:49:07 +0000 (+0800)
Subject: renice: use proper types and strutils for ID parsing
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af630ea848cf8701d22688671d944b7f134fd623;p=thirdparty%2Futil-linux.git

renice: use proper types and strutils for ID parsing

Use ul_strtou32() instead of strtol() to parse PID/UID/GID and reject
negative values. Use strtos32_or_err() for priority. Change 'who' type
to uid_t and adjust getprio()/donice(). Use %u for unsigned IDs.

Addresses: https://github.com/util-linux/util-linux/issues/4272
Signed-off-by: WanBingjiang <wanbingjiang@webray.com.cn>
---

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index ce91468e6..d79ff34e5 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -104,6 +104,7 @@ usrbin_exec_PROGRAMS += renice
 MANPAGES += sys-utils/renice.1
 dist_noinst_DATA += sys-utils/renice.1.adoc
 renice_SOURCES = sys-utils/renice.c
+renice_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_RFKILL
diff --git a/sys-utils/renice.c b/sys-utils/renice.c
index d2139a6bf..e417e8777 100644
--- a/sys-utils/renice.c
+++ b/sys-utils/renice.c
@@ -49,6 +49,8 @@
 #include "nls.h"
 #include "c.h"
 #include "closestream.h"
+#include "strutils.h"
+#include "pwdutils.h"
 
 static const char *const idtype[] = {
 	[PRIO_PROCESS]	= N_("process ID"),
@@ -83,18 +85,18 @@ static void __attribute__((__noreturn__)) usage(void)
 	exit(EXIT_SUCCESS);
 }
 
-static int getprio(const int which, const int who, int *prio)
+static int getprio(const int which, const id_t who, int *prio)
 {
 	errno = 0;
 	*prio = getpriority(which, who);
 	if (*prio == -1 && errno) {
-		warn(_("failed to get priority for %d (%s)"), who, idtype[which]);
+		warn(_("failed to get priority for %u (%s)"), (unsigned int)who, idtype[which]);
 		return -errno;
 	}
 	return 0;
 }
 
-static int donice(const int which, const int who, const int prio, const int relative)
+static int donice(const int which, const id_t who, const int prio, const int relative)
 {
 	int oldprio, newprio;
 
@@ -107,13 +109,13 @@ static int donice(const int which, const int who, const int prio, const int rela
 		newprio = oldprio + prio;
 
 	if (setpriority(which, who, newprio) < 0) {
-		warn(_("failed to set priority for %d (%s)"), who, idtype[which]);
+		warn(_("failed to set priority for %u (%s)"), (unsigned int)who, idtype[which]);
 		return 1;
 	}
 	if (getprio(which, who, &newprio) != 0)
 		return 1;
-	printf(_("%d (%s) old priority %d, new priority %d\n"),
-	       who, idtype[which], oldprio, newprio);
+	printf(_("%u (%s) old priority %d, new priority %d\n"),
+	       (unsigned int)who, idtype[which], oldprio, newprio);
 	return 0;
 }
 
@@ -124,9 +126,9 @@ static int donice(const int which, const int who, const int prio, const int rela
 int main(int argc, char **argv)
 {
 	int which = PRIO_PROCESS;
-	int who = 0, prio, errs = 0;
+	id_t who;
+	int prio, errs = 0;
 	int relative = 0;
-	char *endptr = NULL;
 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
@@ -176,11 +178,7 @@ int main(int argc, char **argv)
 		errtryhelp(EXIT_FAILURE);
 	}
 
-	prio = strtol(*argv, &endptr, 10);
-	if (*endptr) {
-		warnx(_("invalid priority '%s'"), *argv);
-		errtryhelp(EXIT_FAILURE);
-	}
+	prio = strtos32_or_err(*argv, _("invalid priority value"));
 	argc--;
 	argv++;
 
@@ -198,26 +196,24 @@ int main(int argc, char **argv)
 			continue;
 		}
 		if (which == PRIO_USER) {
-			struct passwd *pwd = getpwnam(*argv);
-
-			if (pwd != NULL)
-				who = pwd->pw_uid;
-			else
-				who = strtol(*argv, &endptr, 10);
-			if (who < 0 || *endptr) {
+			uid_t uid;
+			ul_getuserpw_str(*argv, &uid);
+			if (uid == (uid_t)-1) {
 				warnx(_("unknown user %s"), *argv);
 				errs = 1;
 				continue;
 			}
+			who = uid;
 		} else {
-			who = strtol(*argv, &endptr, 10);
-			if (who < 0 || *endptr) {
+			uint32_t id;
+			if (ul_strtou32(*argv, &id, 10) != 0) {
 				/* TRANSLATORS: The first %s is one of the above
 				 * three ID names. Read: "bad value for %s: %s" */
 				warnx(_("bad %s value: %s"), idtype[which], *argv);
 				errs = 1;
 				continue;
 			}
+			who = id;
 		}
 		errs |= donice(which, who, prio, relative);
 	}