From: Karel Zak <kzak@redhat.com>
Date: Mon, 20 May 2019 10:57:39 +0000 (+0200)
Subject: vipw: use xstrncpy()
X-Git-Tag: v2.34-rc2~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=124a903002b5a42e822509e9f6a9f05696113192;p=thirdparty%2Futil-linux.git

vipw: use xstrncpy()

It's already used by vipw, so use it everywhere.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index 2b35036e61..a071b639dd 100644
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -335,7 +335,7 @@ int main(int argc, char *argv[])
 		xstrncpy(orig_file, PASSWD_FILE, sizeof(orig_file));
 	}
 
-	while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
+	while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1) {
 		switch (c) {
 		case 'V':
 			print_version(EXIT_SUCCESS);
@@ -344,14 +344,14 @@ int main(int argc, char *argv[])
 		default:
 			errtryhelp(EXIT_FAILURE);
 		}
+	}
 
 	edit_file(0);
 
-	if (program == VIGR) {
-		strncpy(orig_file, SGROUP_FILE, FILENAMELEN - 1);
-	} else {
-		strncpy(orig_file, SHADOW_FILE, FILENAMELEN - 1);
-	}
+	if (program == VIGR)
+		xstrncpy(orig_file, SGROUP_FILE, sizeof(orig_file));
+	else
+		xstrncpy(orig_file, SHADOW_FILE, sizeof(orig_file));
 
 	if (access(orig_file, F_OK) == 0) {
 		char response[80];