From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 18 Aug 2019 09:29:32 +0000 (+0100)
Subject: setpwnam: use more appropriate allocation size types
X-Git-Tag: v2.35-rc1~274
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Futil-linux.git;a=commitdiff_plain;h=ff9da8efca1ca92f332250197fee9b94feb7a82d

setpwnam: use more appropriate allocation size types

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/login-utils/setpwnam.c b/login-utils/setpwnam.c
index 0616c79236..3e3c1abde5 100644
--- a/login-utils/setpwnam.c
+++ b/login-utils/setpwnam.c
@@ -74,11 +74,11 @@ static void pw_init(void);
 int setpwnam(struct passwd *pwd, const char *prefix)
 {
 	FILE *fp = NULL, *pwf = NULL;
-	int save_errno;
-	int found;
-	int namelen;
-	int buflen = 256;
-	int contlen, rc;
+	int save_errno, rc;
+	uint8_t found = 0;
+	size_t namelen;
+	size_t contlen;
+	size_t buflen = 256;
 	char *linebuf = NULL;
 	char *tmpname = NULL;
 
@@ -105,8 +105,6 @@ int setpwnam(struct passwd *pwd, const char *prefix)
 		goto fail;
 
 	/* parse the passwd file */
-	found = false;
-
 	/* Do you wonder why I don't use getpwent? Read comments at top of
 	 * file */
 	while (fgets(linebuf, buflen, pwf) != NULL) {
@@ -134,7 +132,7 @@ int setpwnam(struct passwd *pwd, const char *prefix)
 			 * change it!  */
 			if (putpwent(pwd, fp) < 0)
 				goto fail;
-			found = true;
+			found = 1;
 			continue;
 		}
 		/* Nothing in particular happened, copy input to output */