From 8636b161b333b18525b6f5ffc5139079c29c0d63 Mon Sep 17 00:00:00 2001 From: brian Date: Mon, 9 Jul 2001 09:24:06 +0000 Subject: Fix the type of the NULL arg to execl() Idea from: Theo de Raadt --- usr.bin/apply/apply.c | 2 +- usr.bin/calendar/io.c | 4 ++-- usr.bin/ee/ee.c | 2 +- usr.bin/enigma/enigma.c | 10 +++++----- usr.bin/ldd/ldd.c | 2 +- usr.bin/login/login.c | 2 +- usr.bin/newkey/update.c | 2 +- usr.bin/script/script.c | 2 +- usr.bin/telnet/commands.c | 4 ++-- usr.bin/tip/tip/cmds.c | 6 +++--- usr.bin/xinstall/xinstall.c | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index 0894957..1fc4796 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -244,7 +244,7 @@ exec_shell(const char *command, char *use_shell, char *use_name) err(1, "vfork"); case 0: /* child */ (void)sigsetmask(omask); - execl(use_shell, use_name, "-c", command, NULL); + execl(use_shell, use_name, "-c", command, (char *)NULL); warn("%s", use_shell); _exit(1); } diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c index 51ab84b..91e3f51 100644 --- a/usr.bin/calendar/io.c +++ b/usr.bin/calendar/io.c @@ -281,7 +281,7 @@ opencal() } execl(_PATH_CPP, "cpp", "-P", "-traditional", "-nostdinc", /* GCC specific opts */ - "-I.", "-I", _PATH_INCLUDE, NULL); + "-I.", "-I", _PATH_INCLUDE, (char *)NULL); warn(_PATH_CPP); _exit(1); } @@ -344,7 +344,7 @@ closecal(fp) _exit(1); } execl(_PATH_SENDMAIL, "sendmail", "-i", "-t", "-F", - "\"Reminder Service\"", NULL); + "\"Reminder Service\"", (char *)NULL); warn(_PATH_SENDMAIL); _exit(1); } diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c index 3c624a2..475e9e8 100644 --- a/usr.bin/ee/ee.c +++ b/usr.bin/ee/ee.c @@ -3148,7 +3148,7 @@ char *string; /* string containing user command */ } for (value = 1; value < 24; value++) signal(value, SIG_DFL); - execl(path, last_slash, "-c", string, NULL); + execl(path, last_slash, "-c", string, (char *)NULL); errx(1, exec_err_msg, path); } else /* if the parent */ diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c index 546b144..e1c2f94 100644 --- a/usr.bin/enigma/enigma.c +++ b/usr.bin/enigma/enigma.c @@ -56,11 +56,11 @@ setup(pw) close(1); dup(pf[0]); dup(pf[1]); - execlp("makekey", "-", 0); - execl("/usr/libexec/makekey", "-", 0); /* BSDI */ - execl("/usr/lib/makekey", "-", 0); - execl("/usr/bin/makekey", "-", 0); /* IBM */ - execl("/lib/makekey", "-", 0); + execlp("makekey", "-", (char *)0); + execl("/usr/libexec/makekey", "-", (char *)0); /* BSDI */ + execl("/usr/lib/makekey", "-", (char *)0); + execl("/usr/bin/makekey", "-", (char *)0); /* IBM */ + execl("/lib/makekey", "-", (char *)0); perror("makekey"); fprintf(stderr, "enigma: cannot execute 'makekey', aborting\n"); exit(1); diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c index 0f82b89..b618f45 100644 --- a/usr.bin/ldd/ldd.c +++ b/usr.bin/ldd/ldd.c @@ -204,7 +204,7 @@ char *argv[]; } break; case 0: - rval |= execl(*argv, *argv, NULL) != 0; + rval |= execl(*argv, *argv, (char *)NULL) != 0; warn("%s", *argv); _exit(1); } diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index c1f2baa..7d0f24a 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -704,7 +704,7 @@ main(argc, argv) (void)strcpy(tbuf + 1, (p = strrchr(pwd->pw_shell, '/')) ? p + 1 : pwd->pw_shell); - execlp(shell, tbuf, 0); + execlp(shell, tbuf, (char *)0); err(1, "%s", shell); } diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c index 2f1c53f..23248ef 100644 --- a/usr.bin/newkey/update.c +++ b/usr.bin/newkey/update.c @@ -188,7 +188,7 @@ _openchild(command, fto, ffrom) _exit(~0); } (void)sprintf(com, "exec %s", command); - execl(SHELL, basename(SHELL), "-c", com, NULL); + execl(SHELL, basename(SHELL), "-c", com, (char *)NULL); _exit(~0); default: diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index 5a19095f..b6a59c8 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -245,7 +245,7 @@ doshell(av) execvp(av[0], av); warn("%s", av[0]); } else { - execl(shell, shell, "-i", NULL); + execl(shell, shell, "-i", (char *)NULL); warn("%s", shell); } fail(); diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c index d8160cc..fb3139c 100644 --- a/usr.bin/telnet/commands.c +++ b/usr.bin/telnet/commands.c @@ -1420,9 +1420,9 @@ shell(argc, argv) else shellname++; if (argc > 1) - execl(shellp, shellname, "-c", &saveline[1], 0); + execl(shellp, shellname, "-c", &saveline[1], (char *)0); else - execl(shellp, shellname, 0); + execl(shellp, shellname, (char *)0); perror("Execl"); _exit(1); } diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c index 10198ba..28b03ef 100644 --- a/usr.bin/tip/tip/cmds.c +++ b/usr.bin/tip/tip/cmds.c @@ -765,7 +765,7 @@ shell() else cp++; shell_uid(); - execl(value(SHELL), cp, 0); + execl(value(SHELL), cp, (char *)0); printf("\r\ncan't execl!\r\n"); exit(1); } @@ -865,7 +865,7 @@ execute(s) else cp++; shell_uid(); - execl(value(SHELL), cp, "-c", s, 0); + execl(value(SHELL), cp, "-c", s, (char *)0); } static int @@ -1051,7 +1051,7 @@ expand(name) close(pivec[1]); close(2); shell_uid(); - execl(Shell, Shell, "-c", cmdbuf, 0); + execl(Shell, Shell, "-c", cmdbuf, (char *)0); _exit(1); } if (pid == -1) { diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 55d59cc..9abe6a3 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -708,7 +708,7 @@ strip(to_name) errno = serrno; err(EX_TEMPFAIL, "fork"); case 0: - execlp("strip", "strip", to_name, NULL); + execlp("strip", "strip", to_name, (char *)NULL); err(EX_OSERR, "exec(strip)"); default: if (wait(&status) == -1 || status) { -- cgit v1.1