svn commit: r247687 - stable/8/usr.sbin/sysinstall

[Devin Teske]

Author: dteske
Date: Sun Mar  3 07:45:40 2013
New Revision: 247687
URL: http://svnweb.freebsd.org/changeset/base/247687

Log:
  MFS 9->8 r234737:
  
  Fix several 'format string is not a literal' warnings in sysinstall.
  
  Since sysinstall does not exist anymore in head, this is a direct
  commit.

Modified:
  stable/8/usr.sbin/sysinstall/dispatch.c
  stable/8/usr.sbin/sysinstall/install.c
  stable/8/usr.sbin/sysinstall/label.c
  stable/8/usr.sbin/sysinstall/modules.c

Modified: stable/8/usr.sbin/sysinstall/dispatch.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/dispatch.c	Sun Mar  3 07:27:15 2013	(r247686)
+++ stable/8/usr.sbin/sysinstall/dispatch.c	Sun Mar  3 07:45:40 2013	(r247687)
@@ -591,7 +591,7 @@ dispatch_load_menu(dialogMenuItem *self)
     if (err != NULL) {
 	what |= DITEM_FAILURE;
 	if (!variable_get(VAR_NO_ERROR))
-	    msgConfirm(err);
+	    msgConfirm("%s", err);
     }
 
     return (what);

Modified: stable/8/usr.sbin/sysinstall/install.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/install.c	Sun Mar  3 07:27:15 2013	(r247686)
+++ stable/8/usr.sbin/sysinstall/install.c	Sun Mar  3 07:45:40 2013	(r247687)
@@ -1018,10 +1018,10 @@ performNewfs(PartInfo *pi, char *dname, 
 		}
 
 		if (queue == QUEUE_YES) {
-			command_shell_add(pi->mountpoint, buffer);
+			command_shell_add(pi->mountpoint, "%s", buffer);
 			return (0);
 		} else
-			return (vsystem(buffer));
+			return (vsystem("%s", buffer));
 	}
 	return (0);
 }

Modified: stable/8/usr.sbin/sysinstall/label.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/label.c	Sun Mar  3 07:27:15 2013	(r247686)
+++ stable/8/usr.sbin/sysinstall/label.c	Sun Mar  3 07:45:40 2013	(r247687)
@@ -978,7 +978,7 @@ diskLabel(Device *dev)
 		}
 		if (msg) {
 		    if (req) {
-			msgConfirm(msg);
+			msgConfirm("%s", msg);
 			clear_wins();
 			msg = NULL;
 		    }

Modified: stable/8/usr.sbin/sysinstall/modules.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/modules.c	Sun Mar  3 07:27:15 2013	(r247686)
+++ stable/8/usr.sbin/sysinstall/modules.c	Sun Mar  3 07:45:40 2013	(r247687)
@@ -199,7 +199,7 @@ kldBrowser(dialogMenuItem *self)
     if (err != NULL) {
 	what |= DITEM_FAILURE;
 	if (!variable_get(VAR_NO_ERROR))
-	    msgConfirm(err);
+	    msgConfirm("%s", err);
     }
     
     return (what);