summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-07-09 07:05:10 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-07-09 07:05:10 +0000
commite794dc8249450a31cf35cb2aa88a33779325b689 (patch)
tree7fe943aa48c43bd24ed6b9267ab44c0191c44d4a /sbin
parent5b1ba3114a10793470c731e714160f24131b690d (diff)
correct type on last arg to execl(); nordin@cse.ogi.edu
Diffstat (limited to 'sbin')
-rw-r--r--sbin/init/init.c6
-rw-r--r--sbin/modload/modload.c6
-rw-r--r--sbin/reboot/reboot.c6
-rw-r--r--sbin/shutdown/shutdown.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/sbin/init/init.c b/sbin/init/init.c
index f71da41dcdc..aa69686b6ad 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.21 2001/01/19 17:57:37 deraadt Exp $ */
+/* $OpenBSD: init.c,v 1.22 2001/07/09 07:04:45 deraadt Exp $ */
/* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */
/*-
@@ -47,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.21 2001/01/19 17:57:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.22 2001/07/09 07:04:45 deraadt Exp $";
#endif
#endif /* not lint */
@@ -1416,7 +1416,7 @@ nice_death()
sigprocmask(SIG_SETMASK, &sa.sa_mask, NULL);
execl(_PATH_BSHELL, "sh", _PATH_RUNCOM, "shutdown",
- NULL);
+ (char *)NULL);
stall("can't exec %s for %s %s: %m", _PATH_BSHELL,
_PATH_RUNCOM, "shutdown");
_exit(1);
diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c
index 711023e26d5..ec982a68d8a 100644
--- a/sbin/modload/modload.c
+++ b/sbin/modload/modload.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: modload.c,v 1.25 2001/07/07 18:26:15 deraadt Exp $ */
+/* $OpenBSD: modload.c,v 1.26 2001/07/09 07:04:46 deraadt Exp $ */
/* $NetBSD: modload.c,v 1.13 1995/05/28 05:21:58 jtc Exp $ */
/*
@@ -103,7 +103,7 @@ linkcmd(kernel, entry, outfile, address, object)
if (pid == 0) {
execl(_PATH_LD, "ld", LDSYMTABLE, kernel, "-e", entrybuf, "-o",
- outfile, LDTEXTSTART, addrbuf, object, NULL);
+ outfile, LDTEXTSTART, addrbuf, object, (char *)NULL);
exit(128 + errno);
}
@@ -494,7 +494,7 @@ main(argc, argv)
cleanup();
- execl(post, post, id, type, offset, 0);
+ execl(post, post, id, type, offset, (char *)NULL);
err(16, "can't exec `%s'", post);
}
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index d86c4b1541d..19cda4b9f52 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: reboot.c,v 1.19 2001/06/04 14:59:49 mickey Exp $ */
+/* $OpenBSD: reboot.c,v 1.20 2001/07/09 07:04:46 deraadt Exp $ */
/* $NetBSD: reboot.c,v 1.8 1995/10/05 05:36:22 mycroft Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93";
#else
-static char rcsid[] = "$OpenBSD: reboot.c,v 1.19 2001/06/04 14:59:49 mickey Exp $";
+static char rcsid[] = "$OpenBSD: reboot.c,v 1.20 2001/07/09 07:04:46 deraadt Exp $";
#endif
#endif /* not lint */
@@ -196,7 +196,7 @@ main(argc, argv)
t.c_oflag |= (ONLCR | OPOST);
tcsetattr(0, TCSANOW, &t);
- execl(_PATH_BSHELL, "sh", _PATH_RC, "shutdown", NULL);
+ execl(_PATH_BSHELL, "sh", _PATH_RC, "shutdown", (char *)NULL);
_exit(1);
default:
waitpid(pid, NULL, 0);
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 52ed7cb6f86..7e5f93e8227 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: shutdown.c,v 1.21 2001/07/07 18:26:22 deraadt Exp $ */
+/* $OpenBSD: shutdown.c,v 1.22 2001/07/09 07:04:47 deraadt Exp $ */
/* $NetBSD: shutdown.c,v 1.9 1995/03/18 15:01:09 cgd Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94";
#else
-static char rcsid[] = "$OpenBSD: shutdown.c,v 1.21 2001/07/07 18:26:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: shutdown.c,v 1.22 2001/07/09 07:04:47 deraadt Exp $";
#endif
#endif /* not lint */
@@ -424,7 +424,7 @@ die_you_gravy_sucking_pig_dog()
t.c_oflag |= (ONLCR | OPOST);
tcsetattr(0, TCSANOW, &t);
- execl(_PATH_BSHELL, "sh", _PATH_RC, "shutdown", NULL);
+ execl(_PATH_BSHELL, "sh", _PATH_RC, "shutdown", (char *)NULL);
_exit(1);
default:
waitpid(pid, NULL, 0);