summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/apply/apply.c6
-rw-r--r--usr.bin/calendar/io.c8
-rw-r--r--usr.bin/learn/src/learn.c14
-rw-r--r--usr.bin/login/login.c6
-rw-r--r--usr.bin/mg/fileio.c4
-rw-r--r--usr.bin/newsyslog/newsyslog.c6
-rw-r--r--usr.bin/oldrdist/server.c6
-rw-r--r--usr.bin/rdist/common.c6
-rw-r--r--usr.bin/rdist/rdist.c6
-rw-r--r--usr.bin/script/script.c6
-rw-r--r--usr.bin/skeyaudit/skeyaudit.c4
-rw-r--r--usr.bin/ssh/session.c4
-rw-r--r--usr.bin/ssh/sftp-int.c6
-rw-r--r--usr.bin/telnet/commands.c6
-rw-r--r--usr.bin/tip/cmds.c10
-rw-r--r--usr.bin/tn3270/sys_curses/system.c6
-rw-r--r--usr.bin/tput/tput.c6
-rw-r--r--usr.bin/vacation/vacation.c6
-rw-r--r--usr.bin/vi/ex/ex_argv.c4
-rw-r--r--usr.bin/vi/ex/ex_cscope.c4
-rw-r--r--usr.bin/vi/ex/ex_filter.c4
-rw-r--r--usr.bin/vi/ex/ex_script.c4
-rw-r--r--usr.bin/vi/ex/ex_shell.c4
-rw-r--r--usr.bin/window/wwterminfo.c6
-rw-r--r--usr.bin/xinstall/xinstall.c6
25 files changed, 74 insertions, 74 deletions
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 079b955f491..06875df4a6a 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apply.c,v 1.8 2000/12/24 11:22:54 aaron Exp $ */
+/* $OpenBSD: apply.c,v 1.9 2001/07/09 07:04:47 deraadt Exp $ */
/* $NetBSD: apply.c,v 1.3 1995/03/25 03:38:23 glass Exp $ */
/*-
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94";
#else
-static char rcsid[] = "$OpenBSD: apply.c,v 1.8 2000/12/24 11:22:54 aaron Exp $";
+static char rcsid[] = "$OpenBSD: apply.c,v 1.9 2001/07/09 07:04:47 deraadt Exp $";
#endif
#endif /* not lint */
@@ -218,7 +218,7 @@ system(command)
err(1, "fork");
case 0: /* child */
(void)sigsetmask(omask);
- execl(shell, name, "-c", command, NULL);
+ execl(shell, name, "-c", command, (char *)NULL);
err(1, "%s", shell);
}
intsave = signal(SIGINT, SIG_IGN);
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 84d70a4735c..2b6766a0507 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.11 2001/06/05 21:27:16 pjanzen Exp $ */
+/* $OpenBSD: io.c,v 1.12 2001/07/09 07:04:48 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -43,7 +43,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
#else
-static char rcsid[] = "$OpenBSD: io.c,v 1.11 2001/06/05 21:27:16 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: io.c,v 1.12 2001/07/09 07:04:48 deraadt Exp $";
#endif
#endif /* not lint */
@@ -362,7 +362,7 @@ opencal()
(void)close(pdes[0]);
(void)setuid(geteuid());
(void)setgid(getegid());
- execl(_PATH_CPP, "cpp", "-P", "-I.", _PATH_INCLUDE, NULL);
+ execl(_PATH_CPP, "cpp", "-P", "-I.", _PATH_INCLUDE, (char *)NULL);
warn(_PATH_CPP);
_exit(1);
}
@@ -413,7 +413,7 @@ closecal(fp)
(void)setuid(geteuid());
(void)setgid(getegid());
execl(_PATH_SENDMAIL, "sendmail", "-i", "-t", "-F",
- "\"Reminder Service\"", NULL);
+ "\"Reminder Service\"", (char *)NULL);
warn(_PATH_SENDMAIL);
_exit(1);
}
diff --git a/usr.bin/learn/src/learn.c b/usr.bin/learn/src/learn.c
index 3cabb520065..df4bc3eb907 100644
--- a/usr.bin/learn/src/learn.c
+++ b/usr.bin/learn/src/learn.c
@@ -2,7 +2,7 @@
* learn, from V7 UNIX: one of the earliest Computer Based Training (CBT)
* programs still in existence.
*
- * $OpenBSD: learn.c,v 1.4 2000/06/30 16:00:23 millert Exp $
+ * $OpenBSD: learn.c,v 1.5 2001/07/09 07:04:48 deraadt Exp $
*/
/****************************************************************
@@ -469,8 +469,8 @@ makpipe()
close(0);
dup(f[0]);
close(f[0]);
- execl ("/bin/sh", "sh", "-i", 0);
- execl ("/usr/bin/sh", "sh", "-i", 0);
+ execl ("/bin/sh", "sh", "-i", (char *)NULL);
+ execl ("/usr/bin/sh", "sh", "-i", (char *)NULL);
write(2,"Exec error\n",11);
}
close(f[0]);
@@ -496,7 +496,7 @@ maktee()
close(out);
dup(in);
close(in);
- execl (tee, "lrntee", 0);
+ execl (tee, "lrntee", (char *)NULL);
fprintf(stderr, "Tee exec failed\n");
exit(1);
}
@@ -699,7 +699,7 @@ int system(const char *s)
if ((pid = fork()) == 0) {
signal(SIGINT, SIG_DFL);
signal(SIGQUIT, SIG_DFL);
- execl("/bin/sh", "sh", "-c", s, 0);
+ execl("/bin/sh", "sh", "-c", s, (char *)NULL);
_exit(127);
}
while ((w = wait(&status)) != pid && w != -1)
@@ -1029,8 +1029,8 @@ int n;
chdir("..");
if ( (pid=fork()) ==0) {
signal(SIGHUP, SIG_IGN);
- execl("/bin/rm", "rm", "-r", playdir, 0);
- execl("/usr/bin/rm", "rm", "-r", playdir, 0);
+ execl("/bin/rm", "rm", "-r", playdir, (char *)NULL);
+ execl("/usr/bin/rm", "rm", "-r", playdir, (char *)NULL);
fprintf(stderr, "Can't find 'rm' command.\n");
exit(0);
}
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index ee03a7153f3..cf56213e0db 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login.c,v 1.41 2001/07/06 18:12:06 pvalchev Exp $ */
+/* $OpenBSD: login.c,v 1.42 2001/07/09 07:04:49 deraadt Exp $ */
/* $NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $ */
/*-
@@ -77,7 +77,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$OpenBSD: login.c,v 1.41 2001/07/06 18:12:06 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: login.c,v 1.42 2001/07/09 07:04:49 deraadt Exp $";
#endif /* not lint */
/*
@@ -769,7 +769,7 @@ failed:
kgettokens(pwd->pw_dir);
#endif
- execlp(shell, tbuf, 0);
+ execlp(shell, tbuf, (char *)NULL);
err(1, "%s", shell);
}
diff --git a/usr.bin/mg/fileio.c b/usr.bin/mg/fileio.c
index 9b92b28887b..567684ca869 100644
--- a/usr.bin/mg/fileio.c
+++ b/usr.bin/mg/fileio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fileio.c,v 1.18 2001/07/06 13:32:45 art Exp $ */
+/* $OpenBSD: fileio.c,v 1.19 2001/07/09 07:04:49 deraadt Exp $ */
/*
* POSIX fileio.c
@@ -401,7 +401,7 @@ copy(frname, toname)
if ((pid = vfork())) {
if (pid == -1)
return -1;
- execl("/bin/cp", "cp", frname, toname, NULL);
+ execl("/bin/cp", "cp", frname, toname, (char *)NULL);
_exit(1); /* shouldn't happen */
}
waitpid(pid, &status, 0);
diff --git a/usr.bin/newsyslog/newsyslog.c b/usr.bin/newsyslog/newsyslog.c
index 058ec397f0a..ab87e856f1c 100644
--- a/usr.bin/newsyslog/newsyslog.c
+++ b/usr.bin/newsyslog/newsyslog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: newsyslog.c,v 1.36 2001/03/01 20:34:10 aaron Exp $ */
+/* $OpenBSD: newsyslog.c,v 1.37 2001/07/09 07:04:50 deraadt Exp $ */
/*
* Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -88,7 +88,7 @@ provided "as is" without express or implied warranty.
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.36 2001/03/01 20:34:10 aaron Exp $";
+static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.37 2001/07/09 07:04:50 deraadt Exp $";
#endif /* not lint */
#ifndef CONF
@@ -724,7 +724,7 @@ compress_log(log)
if (pid < 0) {
err(1, "fork");
} else if (!pid) {
- (void)execl(COMPRESS, base, "-f", tmp, 0);
+ (void)execl(COMPRESS, base, "-f", tmp, (char *)NULL);
warn(COMPRESS);
_exit(1);
}
diff --git a/usr.bin/oldrdist/server.c b/usr.bin/oldrdist/server.c
index 21b85ce56bf..21afe62243f 100644
--- a/usr.bin/oldrdist/server.c
+++ b/usr.bin/oldrdist/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.12 1999/08/17 09:13:16 millert Exp $ */
+/* $OpenBSD: server.c,v 1.13 2001/07/09 07:04:50 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: server.c,v 1.12 1999/08/17 09:13:16 millert Exp $";
+static char *rcsid = "$OpenBSD: server.c,v 1.13 2001/07/09 07:04:50 deraadt Exp $";
#endif /* not lint */
#include <sys/wait.h>
@@ -1391,7 +1391,7 @@ dospecial(cmd)
seteuid(userid);
setuid(userid);
#endif /* DIRECT_RCMD */
- execl(_PATH_BSHELL, "sh", "-c", cmd, 0);
+ execl(_PATH_BSHELL, "sh", "-c", cmd, (char *)NULL);
_exit(127);
}
(void) close(fd[1]);
diff --git a/usr.bin/rdist/common.c b/usr.bin/rdist/common.c
index acda69d8315..6df127bbfcc 100644
--- a/usr.bin/rdist/common.c
+++ b/usr.bin/rdist/common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.c,v 1.10 2000/11/10 15:33:12 provos Exp $ */
+/* $OpenBSD: common.c,v 1.11 2001/07/09 07:04:51 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
"$From: common.c,v 6.82 1998/03/23 23:27:33 michaelc Exp $";
#else
static char RCSid[] =
-"$OpenBSD: common.c,v 1.10 2000/11/10 15:33:12 provos Exp $";
+"$OpenBSD: common.c,v 1.11 2001/07/09 07:04:51 deraadt Exp $";
#endif
static char sccsid[] = "@(#)common.c";
@@ -836,7 +836,7 @@ void runcommand(cmd)
(void) dup(fd[PIPE_WRITE]);
(void) close(fd[PIPE_READ]);
(void) close(fd[PIPE_WRITE]);
- (void) execl(_PATH_BSHELL, "sh", "-c", cmd, 0);
+ (void) execl(_PATH_BSHELL, "sh", "-c", cmd, (char *)NULL);
_exit(127);
}
(void) close(fd[PIPE_WRITE]);
diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c
index c4b19bb2869..ab48f86fb85 100644
--- a/usr.bin/rdist/rdist.c
+++ b/usr.bin/rdist/rdist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdist.c,v 1.7 1999/02/04 23:18:57 millert Exp $ */
+/* $OpenBSD: rdist.c,v 1.8 2001/07/09 07:04:51 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
"$From: rdist.c,v 6.65 1995/12/12 00:20:39 mcooper Exp $";
#else
static char RCSid[] =
-"$OpenBSD: rdist.c,v 1.7 1999/02/04 23:18:57 millert Exp $";
+"$OpenBSD: rdist.c,v 1.8 2001/07/09 07:04:51 deraadt Exp $";
#endif
static char sccsid[] = "@(#)main.c 5.1 (Berkeley) 6/6/85";
@@ -143,7 +143,7 @@ main(argc, argv, envp)
"Old rdist (-Server) requested; running %s",
_PATH_OLDRDIST);
(void) execl(_PATH_OLDRDIST, xbasename(_PATH_OLDRDIST),
- "-Server", NULL);
+ "-Server", (char *)NULL);
fatalerr("Exec old rdist failed: %s: %s.",
_PATH_OLDRDIST, SYSERR);
#else /* !_PATH_OLDRDIST */
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 0c1e5af3fcf..972a1cf405a 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: script.c,v 1.14 2001/01/11 19:26:01 deraadt Exp $ */
+/* $OpenBSD: script.c,v 1.15 2001/07/09 07:04:52 deraadt Exp $ */
/* $NetBSD: script.c,v 1.3 1994/12/21 08:55:43 jtc Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: script.c,v 1.14 2001/01/11 19:26:01 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: script.c,v 1.15 2001/07/09 07:04:52 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -246,7 +246,7 @@ doshell()
(void)close(master);
(void)fclose(fscript);
login_tty(slave);
- execl(shell, shell, "-i", NULL);
+ execl(shell, shell, "-i", (char *)NULL);
perror(shell);
fail();
}
diff --git a/usr.bin/skeyaudit/skeyaudit.c b/usr.bin/skeyaudit/skeyaudit.c
index afba42ab5b8..84b2e183fc5 100644
--- a/usr.bin/skeyaudit/skeyaudit.c
+++ b/usr.bin/skeyaudit/skeyaudit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: skeyaudit.c,v 1.10 2000/09/20 21:53:49 pjanzen Exp $ */
+/* $OpenBSD: skeyaudit.c,v 1.11 2001/07/09 07:04:52 deraadt Exp $ */
/*
* Copyright (c) 1997, 2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -202,7 +202,7 @@ runsendmail(pw, pidp)
_exit(127);
}
- execl(_PATH_SENDMAIL, "sendmail", "-t", NULL);
+ execl(_PATH_SENDMAIL, "sendmail", "-t", (char *)NULL);
warn("cannot run \"%s -t\"", _PATH_SENDMAIL);
_exit(127);
}
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c
index b705c189147..f19424783b2 100644
--- a/usr.bin/ssh/session.c
+++ b/usr.bin/ssh/session.c
@@ -33,7 +33,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.98 2001/07/02 13:59:15 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.99 2001/07/09 07:04:53 deraadt Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -1124,7 +1124,7 @@ do_child(Session *s, const char *command)
/* Launch login(1). */
execl("/usr/bin/login", "login", "-h", hostname,
- "-p", "-f", "--", pw->pw_name, NULL);
+ "-p", "-f", "--", pw->pw_name, (char *)NULL);
/* Login couldn't be executed, die. */
diff --git a/usr.bin/ssh/sftp-int.c b/usr.bin/ssh/sftp-int.c
index 0ec69ddc224..77b20f5f691 100644
--- a/usr.bin/ssh/sftp-int.c
+++ b/usr.bin/ssh/sftp-int.c
@@ -26,7 +26,7 @@
/* XXX: recursive operations */
#include "includes.h"
-RCSID("$OpenBSD: sftp-int.c,v 1.37 2001/06/23 15:12:20 itojun Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.38 2001/07/09 07:04:53 deraadt Exp $");
#include <glob.h>
@@ -165,10 +165,10 @@ local_do_shell(const char *args)
/* XXX: child has pipe fds to ssh subproc open - issue? */
if (args) {
debug3("Executing %s -c \"%s\"", shell, args);
- execl(shell, shell, "-c", args, NULL);
+ execl(shell, shell, "-c", args, (char *)NULL);
} else {
debug3("Executing %s", shell);
- execl(shell, shell, NULL);
+ execl(shell, shell, (char *)NULL);
}
fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell,
strerror(errno));
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index ce8844c4d8c..7bef2df33cd 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: commands.c,v 1.35 2001/04/30 10:00:04 markus Exp $ */
+/* $OpenBSD: commands.c,v 1.36 2001/07/09 07:04:54 deraadt Exp $ */
/* $NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $ */
/*
@@ -1382,9 +1382,9 @@ shell(argc, argv)
else
shellname++;
if (argc > 1)
- execl(shellp, shellname, "-c", &saveline[1], 0);
+ execl(shellp, shellname, "-c", &saveline[1], (char *)NULL);
else
- execl(shellp, shellname, 0);
+ execl(shellp, shellname, (char *)NULL);
perror("Execl");
_exit(1);
}
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 4aa91ccfbde..96f431b4e0a 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.8 2000/04/20 06:19:33 deraadt Exp $ */
+/* $OpenBSD: cmds.c,v 1.9 2001/07/09 07:04:55 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: cmds.c,v 1.8 2000/04/20 06:19:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.9 2001/07/09 07:04:55 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
@@ -594,7 +594,7 @@ shell()
else
cp++;
shell_uid();
- execl(value(SHELL), cp, 0);
+ execl(value(SHELL), cp, (char *)NULL);
printf("\r\ncan't execl!\r\n");
exit(1);
}
@@ -690,7 +690,7 @@ execute(s)
else
cp++;
shell_uid();
- execl(value(SHELL), cp, "-c", s, 0);
+ execl(value(SHELL), cp, "-c", s, (char *)NULL);
}
int
@@ -862,7 +862,7 @@ expand(name)
close(pivec[1]);
close(2);
shell_uid();
- execl(Shell, Shell, "-c", cmdbuf, 0);
+ execl(Shell, Shell, "-c", cmdbuf, (char *)NULL);
_exit(1);
}
if (pid == -1) {
diff --git a/usr.bin/tn3270/sys_curses/system.c b/usr.bin/tn3270/sys_curses/system.c
index 800913deaba..c22bf7de8f6 100644
--- a/usr.bin/tn3270/sys_curses/system.c
+++ b/usr.bin/tn3270/sys_curses/system.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: system.c,v 1.8 2000/02/01 03:23:44 deraadt Exp $ */
+/* $OpenBSD: system.c,v 1.9 2001/07/09 07:04:55 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -35,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)system.c 4.5 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: system.c,v 1.8 2000/02/01 03:23:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: system.c,v 1.9 2001/07/09 07:04:55 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -738,7 +738,7 @@ char *argv[];
extern char *getenv();
cmdname = getenv("SHELL");
- execlp(cmdname, cmdname, 0);
+ execlp(cmdname, cmdname, (char *)NULL);
perror("Exec'ing new shell...\n");
_exit(1);
} else {
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index 25ad655eb1f..26f42b9bf46 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tput.c,v 1.10 1999/09/12 10:29:01 millert Exp $ */
+/* $OpenBSD: tput.c,v 1.11 2001/07/09 07:04:56 deraadt Exp $ */
/*
* Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -69,7 +69,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tput.c 8.3 (Berkeley) 4/28/95";
#endif
-static char rcsid[] = "$OpenBSD: tput.c,v 1.10 1999/09/12 10:29:01 millert Exp $";
+static char rcsid[] = "$OpenBSD: tput.c,v 1.11 2001/07/09 07:04:56 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -301,7 +301,7 @@ init()
break;
case 0:
/* child */
- execl(init_prog, init_prog, NULL);
+ execl(init_prog, init_prog, (char *)NULL);
_exit(127);
break;
default:
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index 91f840a1483..7ae1ce1679c 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vacation.c,v 1.13 2000/08/05 21:53:30 pjanzen Exp $ */
+/* $OpenBSD: vacation.c,v 1.14 2001/07/09 07:04:56 deraadt Exp $ */
/* $NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)vacation.c 8.2 (Berkeley) 1/26/94";
#endif
-static char rcsid[] = "$OpenBSD: vacation.c,v 1.13 2000/08/05 21:53:30 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: vacation.c,v 1.14 2001/07/09 07:04:56 deraadt Exp $";
#endif /* not lint */
/*
@@ -470,7 +470,7 @@ sendmessage(myname)
close(pvect[1]);
close(fileno(mfp));
execl(_PATH_SENDMAIL, "sendmail", "-f", myname, "--",
- from, NULL);
+ from, (char *)NULL);
syslog(LOG_ERR, "can't exec %s: %m", _PATH_SENDMAIL);
_exit(1);
}
diff --git a/usr.bin/vi/ex/ex_argv.c b/usr.bin/vi/ex/ex_argv.c
index e0b0f951529..1058ec05d09 100644
--- a/usr.bin/vi/ex/ex_argv.c
+++ b/usr.bin/vi/ex/ex_argv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_argv.c,v 1.7 2001/01/29 01:58:41 niklas Exp $ */
+/* $OpenBSD: ex_argv.c,v 1.8 2001/07/09 07:04:57 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -691,7 +691,7 @@ err: if (ifp != NULL)
* XXX
* Assume that all shells have -c.
*/
- execl(sh_path, sh, "-c", bp, NULL);
+ execl(sh_path, sh, "-c", bp, (char *)NULL);
msgq_str(sp, M_SYSERR, sh_path, "118|Error: execl: %s");
_exit(127);
default: /* Parent. */
diff --git a/usr.bin/vi/ex/ex_cscope.c b/usr.bin/vi/ex/ex_cscope.c
index 010cfc31929..a81bad41a28 100644
--- a/usr.bin/vi/ex/ex_cscope.c
+++ b/usr.bin/vi/ex/ex_cscope.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_cscope.c,v 1.5 2001/01/29 01:58:42 niklas Exp $ */
+/* $OpenBSD: ex_cscope.c,v 1.6 2001/07/09 07:04:57 deraadt Exp $ */
/*-
* Copyright (c) 1994, 1996
@@ -406,7 +406,7 @@ err: if (to_cs[0] != -1)
#define CSCOPE_CMD_FMT "cd '%s' && exec cscope -dl -f %s"
(void)snprintf(cmd, sizeof(cmd),
CSCOPE_CMD_FMT, csc->dname, dbname);
- (void)execl(_PATH_BSHELL, "sh", "-c", cmd, NULL);
+ (void)execl(_PATH_BSHELL, "sh", "-c", cmd, (char *)NULL);
msgq_str(sp, M_SYSERR, cmd, "execl: %s");
_exit (127);
/* NOTREACHED */
diff --git a/usr.bin/vi/ex/ex_filter.c b/usr.bin/vi/ex/ex_filter.c
index 4a6588e69f5..4f111788177 100644
--- a/usr.bin/vi/ex/ex_filter.c
+++ b/usr.bin/vi/ex/ex_filter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_filter.c,v 1.3 2001/01/29 01:58:42 niklas Exp $ */
+/* $OpenBSD: ex_filter.c,v 1.4 2001/07/09 07:04:57 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -143,7 +143,7 @@ err: if (input[0] != -1)
else
++name;
- execl(O_STR(sp, O_SHELL), name, "-c", cmd, NULL);
+ execl(O_STR(sp, O_SHELL), name, "-c", cmd, (char *)NULL);
msgq_str(sp, M_SYSERR, O_STR(sp, O_SHELL), "execl: %s");
_exit (127);
/* NOTREACHED */
diff --git a/usr.bin/vi/ex/ex_script.c b/usr.bin/vi/ex/ex_script.c
index 1fd4da0d22b..a666909e90e 100644
--- a/usr.bin/vi/ex/ex_script.c
+++ b/usr.bin/vi/ex/ex_script.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_script.c,v 1.5 2001/01/29 01:58:44 niklas Exp $ */
+/* $OpenBSD: ex_script.c,v 1.6 2001/07/09 07:04:57 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -185,7 +185,7 @@ err: if (sc->sh_master != -1)
sh = sh_path;
else
++sh;
- execl(sh_path, sh, "-i", NULL);
+ execl(sh_path, sh, "-i", (char *)NULL);
msgq_str(sp, M_SYSERR, sh_path, "execl: %s");
_exit(127);
default: /* Parent. */
diff --git a/usr.bin/vi/ex/ex_shell.c b/usr.bin/vi/ex/ex_shell.c
index 198626e2a6c..0acd8992083 100644
--- a/usr.bin/vi/ex/ex_shell.c
+++ b/usr.bin/vi/ex/ex_shell.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_shell.c,v 1.6 2001/01/29 01:58:44 niklas Exp $ */
+/* $OpenBSD: ex_shell.c,v 1.7 2001/07/09 07:04:57 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -128,7 +128,7 @@ ex_exec_proc(sp, cmdp, cmd, msg, need_newline)
name = O_STR(sp, O_SHELL);
else
++name;
- execl(O_STR(sp, O_SHELL), name, "-c", cmd, NULL);
+ execl(O_STR(sp, O_SHELL), name, "-c", cmd, (char *)NULL);
msgq_str(sp, M_SYSERR, O_STR(sp, O_SHELL), "execl: %s");
_exit(127);
/* NOTREACHED */
diff --git a/usr.bin/window/wwterminfo.c b/usr.bin/window/wwterminfo.c
index 556d7811948..064dc2b4687 100644
--- a/usr.bin/window/wwterminfo.c
+++ b/usr.bin/window/wwterminfo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwterminfo.c,v 1.8 1999/11/14 17:34:24 millert Exp $ */
+/* $OpenBSD: wwterminfo.c,v 1.9 2001/07/09 07:04:58 deraadt Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)wwterminfo.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwterminfo.c,v 1.8 1999/11/14 17:34:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwterminfo.c,v 1.9 2001/07/09 07:04:58 deraadt Exp $";
#endif
#endif /* not lint */
@@ -102,7 +102,7 @@ wwterminfoend()
/* can't really do (or say) anything about errors */
return -1;
case 0:
- execl(_PATH_RM, _PATH_RM, "-rf", wwterminfopath, 0);
+ execl(_PATH_RM, _PATH_RM, "-rf", wwterminfopath, (char *)NULL);
_exit(0);
default:
wait(NULL);
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 2b95eb38c31..e298cd9dcae 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xinstall.c,v 1.26 2001/06/23 23:09:31 millert Exp $ */
+/* $OpenBSD: xinstall.c,v 1.27 2001/07/09 07:04:58 deraadt Exp $ */
/* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#endif
-static char rcsid[] = "$OpenBSD: xinstall.c,v 1.26 2001/06/23 23:09:31 millert Exp $";
+static char rcsid[] = "$OpenBSD: xinstall.c,v 1.27 2001/07/09 07:04:58 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -561,7 +561,7 @@ strip(to_name)
(void)unlink(to_name);
errx(EX_TEMPFAIL, "forks: %s", strerror(serrno));
case 0:
- execl(path_strip, "strip", to_name, NULL);
+ execl(path_strip, "strip", to_name, (char *)NULL);
warn("%s", path_strip);
_exit(EX_OSERR);
default: