[Pkg-shadow-commits] r1740 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-24 19:38:06 +0000 (Thu, 24 Jan 2008)
New Revision: 1740

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/grpck.c
   upstream/trunk/src/pwck.c
   upstream/trunk/src/sulogin.c
   upstream/trunk/src/vipw.c
Log:
Replace printf by puts for fixed strings. This would avoid issues caused
by formats introduced in translated strings.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-24 19:24:03 UTC (rev 1739)
+++ upstream/trunk/ChangeLog	2008-01-24 19:38:06 UTC (rev 1740)
@@ -1,6 +1,7 @@
 2008-01-24  Nicolas François  <nicolas.francois at centraliens.net>
 
-	* src/gpasswd.c, src/chfn.c, src/chage.c, src/chsh.c: Replace
+	* src/gpasswd.c, src/chfn.c, src/chage.c, src/chsh.c, src/grpck.c,
+	src/vipw.c, src/pwck.c, src/sulogin.c: Replace
 	printf by puts for fixed strings. This would avoid issues caused
 	by formats introduced in translated strings.
 

Modified: upstream/trunk/src/grpck.c
===================================================================
--- upstream/trunk/src/grpck.c	2008-01-24 19:24:03 UTC (rev 1739)
+++ upstream/trunk/src/grpck.c	2008-01-24 19:38:06 UTC (rev 1740)
@@ -416,7 +416,7 @@
 			 * Tell the user this entire line is bogus and ask
 			 * them to delete it.
 			 */
-			printf (_("invalid group file entry\n"));
+			puts (_("invalid group file entry\n"));
 			printf (_("delete line '%s'? "), gre->line);
 			*errors += 1;
 
@@ -476,7 +476,7 @@
 			 * Tell the user this entry is a duplicate of
 			 * another and ask them to delete it.
 			 */
-			printf (_("duplicate group entry\n"));
+			puts (_("duplicate group entry\n"));
 			printf (_("delete line '%s'? "), gre->line);
 			*errors += 1;
 
@@ -604,7 +604,7 @@
 			 * Tell the user this entire line is bogus and ask
 			 * them to delete it.
 			 */
-			printf (_("invalid shadow group file entry\n"));
+			puts (_("invalid shadow group file entry\n"));
 			printf (_("delete line '%s'? "), sge->line);
 			*errors += 1;
 
@@ -664,7 +664,7 @@
 			 * Tell the user this entry is a duplicate of
 			 * another and ask them to delete it.
 			 */
-			printf (_("duplicate shadow group entry\n"));
+			puts (_("duplicate shadow group entry\n"));
 			printf (_("delete line '%s'? "), sge->line);
 			*errors += 1;
 

Modified: upstream/trunk/src/pwck.c
===================================================================
--- upstream/trunk/src/pwck.c	2008-01-24 19:24:03 UTC (rev 1739)
+++ upstream/trunk/src/pwck.c	2008-01-24 19:38:06 UTC (rev 1740)
@@ -276,7 +276,7 @@
 			 * Tell the user this entire line is bogus and ask
 			 * them to delete it.
 			 */
-			printf (_("invalid password file entry\n"));
+			puts (_("invalid password file entry\n"));
 			printf (_("delete line '%s'? "), pfe->line);
 			*errors += 1;
 
@@ -335,7 +335,7 @@
 			 * Tell the user this entry is a duplicate of
 			 * another and ask them to delete it.
 			 */
-			printf (_("duplicate password entry\n"));
+			puts (_("duplicate password entry\n"));
 			printf (_("delete line '%s'? "), pfe->line);
 			*errors += 1;
 
@@ -487,7 +487,7 @@
 			 * Tell the user this entire line is bogus and ask
 			 * them to delete it.
 			 */
-			printf (_("invalid shadow password file entry\n"));
+			puts (_("invalid shadow password file entry\n"));
 			printf (_("delete line '%s'? "), spe->line);
 			*errors += 1;
 
@@ -546,7 +546,7 @@
 			 * Tell the user this entry is a duplicate of
 			 * another and ask them to delete it.
 			 */
-			printf (_("duplicate shadow password entry\n"));
+			puts (_("duplicate shadow password entry\n"));
 			printf (_("delete line '%s'? "), spe->line);
 			*errors += 1;
 

Modified: upstream/trunk/src/sulogin.c
===================================================================
--- upstream/trunk/src/sulogin.c	2008-01-24 19:24:03 UTC (rev 1739)
+++ upstream/trunk/src/sulogin.c	2008-01-24 19:38:06 UTC (rev 1740)
@@ -121,7 +121,7 @@
 		}
 	}
 	if (access (PASSWD_FILE, F_OK) == -1) {	/* must be a password file! */
-		printf (_("No password file\n"));
+		puts (_("No password file\n"));
 #ifdef	USE_SYSLOG
 		SYSLOG (LOG_WARN, "No password file\n");
 		closelog ();
@@ -147,7 +147,7 @@
 	if (getppid() == 1) {
 		setsid();
 		if (ioctl(0, TIOCSCTTY, 1))
-			fprintf(stderr,_("TIOCSCTTY failed"));
+			fputs (_("TIOCSCTTY failed"), stderr);
 	}
 	while (*envp)		/* add inherited environment, */
 		addenv (*envp++, NULL);	/* some variables change later */
@@ -171,7 +171,7 @@
 			/*
 			 * Fail secure
 			 */
-			printf (_("No password entry for 'root'\n"));
+			puts (_("No password entry for 'root'\n"));
 #ifdef	USE_SYSLOG
 			SYSLOG (LOG_WARN, "No password entry for 'root'\n");
 			closelog ();

Modified: upstream/trunk/src/vipw.c
===================================================================
--- upstream/trunk/src/vipw.c	2008-01-24 19:24:03 UTC (rev 1739)
+++ upstream/trunk/src/vipw.c	2008-01-24 19:38:06 UTC (rev 1740)
@@ -66,7 +66,7 @@
  */
 static void usage (void)
 {
-	fprintf (stderr, _("Usage: vipw [options]\n"
+	fputs (_("Usage: vipw [options]\n"
 			   "\n"
 			   "Options:\n"
 			   "  -g, --group                   edit group database\n"
@@ -74,7 +74,7 @@
 			   "  -p, --passwd                  edit passwd database\n"
 			   "  -q, --quiet                   quiet mode\n"
 			   "  -s, --shadow                  edit shadow or gshadow database\n"
-			   "\n"));
+			   "\n"), stderr);
 	exit (E_USAGE);
 }