Fix the type of the NULL arg to execl()

Idea from: Theo de Raadt <deraadt@openbsd.org>

4 files changed, 12 insertions, 10 deletions

diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 43dd702..ae3b7bb 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -446,7 +446,7 @@ fixit_common(void)
 	/* use the .profile from the fixit medium */
 	setenv("HOME", "/mnt2", 1);
 	chdir("/mnt2");
-	execlp("sh", "-sh", 0);
+	execlp("sh", "-sh", (char *)0);
 	msgDebug("fixit shell: Failed to execute shell!\n");
 	_exit(1);;
     }
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index b2eb519..789d0a6 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -617,7 +617,7 @@ mediaExtractDistBegin(char *dir, int *fd, int *zpid, int *cpid)
 	}
 	close(qfd[1]);
 	close(pfd[0]);
-	i = execl(gunzip, gunzip, 0);
+	i = execl(gunzip, gunzip, (char *)0);
 	if (isDebug())
 	    msgDebug("%s command returns %d status\n", gunzip, i);
 	exit(i);
@@ -640,9 +640,9 @@ mediaExtractDistBegin(char *dir, int *fd, int *zpid, int *cpid)
 	    dup2(1, 2);
 	}
 	if (strlen(cpioVerbosity()))
-	    i = execl(cpio, cpio, "-idum", cpioVerbosity(), "--block-size", mediaTapeBlocksize(), 0);
+	    i = execl(cpio, cpio, "-idum", cpioVerbosity(), "--block-size", mediaTapeBlocksize(), (char *)0);
 	else
-	    i = execl(cpio, cpio, "-idum", "--block-size", mediaTapeBlocksize(), 0);
+	    i = execl(cpio, cpio, "-idum", "--block-size", mediaTapeBlocksize(), (char *)0);
 	if (isDebug())
 	    msgDebug("%s command returns %d status\n", cpio, i);
 	exit(i);
@@ -705,7 +705,7 @@ mediaExtractDist(char *dir, char *dist, FILE *fp)
 	    close(2);
 	    open("/dev/null", O_WRONLY);
 	}
-	i = execl(gunzip, gunzip, 0);
+	i = execl(gunzip, gunzip, (char *)0);
 	if (isDebug())
 	    msgDebug("%s command returns %d status\n", gunzip, i);
 	exit(i);
@@ -727,9 +727,9 @@ mediaExtractDist(char *dir, char *dist, FILE *fp)
 	    dup2(1, 2);
 	}
 	if (strlen(cpioVerbosity()))
-	    i = execl(cpio, cpio, "-idum", cpioVerbosity(), "--block-size", mediaTapeBlocksize(), 0);
+	    i = execl(cpio, cpio, "-idum", cpioVerbosity(), "--block-size", mediaTapeBlocksize(), (char *)0);
 	else
-	    i = execl(cpio, cpio, "-idum", "--block-size", mediaTapeBlocksize(), 0);
+	    i = execl(cpio, cpio, "-idum", "--block-size", mediaTapeBlocksize(), (char *)0);
 	if (isDebug())
 	    msgDebug("%s command returns %d status\n", cpio, i);
 	exit(i);
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index 73600bf..e7e6c2f 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -182,9 +182,11 @@ package_extract(Device *dev, char *name, Boolean depended)
 	    setenv("BATCH", "t", 1);
 
 	    if (isDebug())
-		i = execl("/usr/sbin/pkg_add", "/usr/sbin/pkg_add", "-v", "-", 0);
+		i = execl("/usr/sbin/pkg_add", "/usr/sbin/pkg_add", "-v", "-",
+		    (char *)0);
 	    else
-		i = execl("/usr/sbin/pkg_add", "/usr/sbin/pkg_add", "-", 0);
+		i = execl("/usr/sbin/pkg_add", "/usr/sbin/pkg_add", "-",
+		    (char *)0);
 	}
 	else {
 	    char buf[BUFSIZ];
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index b222d70..dbf0dc5 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -56,7 +56,7 @@ intr_reboot(dialogMenuItem *self)
 static int
 intr_restart(dialogMenuItem *self)
 {
-	execl(StartName, StartName, NULL);
+	execl(StartName, StartName, (char *)NULL);
 	/* NOTREACHED */
 	return -1;
 }