diff options
author | Brian Somers <brian@FreeBSD.org> | 2001-07-09 09:24:06 +0000 |
---|---|---|
committer | Brian Somers <brian@FreeBSD.org> | 2001-07-09 09:24:06 +0000 |
commit | 7bc6d0158f0e9863a2a13a951321185d214cd3be (patch) | |
tree | a109115514a8774e981280efca775db8a410df5b /usr.sbin | |
parent | b5b15b9e7fbe55119213a41835516dc91b25e978 (diff) | |
download | src-7bc6d0158f0e9863a2a13a951321185d214cd3be.tar.gz src-7bc6d0158f0e9863a2a13a951321185d214cd3be.zip |
Fix the type of the NULL arg to execl()
Idea from: Theo de Raadt <deraadt@openbsd.org>
Notes
Notes:
svn path=/head/; revision=79452
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/chroot/chroot.c | 2 | ||||
-rw-r--r-- | usr.sbin/cron/crontab/crontab.c | 2 | ||||
-rw-r--r-- | usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c | 2 | ||||
-rw-r--r-- | usr.sbin/edquota/edquota.c | 2 | ||||
-rw-r--r-- | usr.sbin/kgzip/kgzcmp.c | 2 | ||||
-rw-r--r-- | usr.sbin/kgzip/kgzld.c | 4 | ||||
-rw-r--r-- | usr.sbin/lpr/lpd/printjob.c | 7 | ||||
-rw-r--r-- | usr.sbin/newsyslog/newsyslog.c | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/lib/file.c | 3 | ||||
-rw-r--r-- | usr.sbin/pw/pw.c | 2 | ||||
-rw-r--r-- | usr.sbin/rpc.yppasswdd/pw_util.c | 5 | ||||
-rw-r--r-- | usr.sbin/rpc.yppasswdd/yppasswdd_server.c | 8 | ||||
-rw-r--r-- | usr.sbin/rpc.ypupdated/update.c | 2 | ||||
-rw-r--r-- | usr.sbin/rpc.ypupdated/yp_dbupdate.c | 2 | ||||
-rw-r--r-- | usr.sbin/sade/install.c | 2 | ||||
-rw-r--r-- | usr.sbin/sade/system.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/install.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/media.c | 12 | ||||
-rw-r--r-- | usr.sbin/sysinstall/package.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/system.c | 2 | ||||
-rw-r--r-- | usr.sbin/vipw/pw_util.c | 6 | ||||
-rw-r--r-- | usr.sbin/ypserv/yp_server.c | 4 |
22 files changed, 43 insertions, 38 deletions
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c index ccd9c493e64d..72f10d5249fb 100644 --- a/usr.sbin/chroot/chroot.c +++ b/usr.sbin/chroot/chroot.c @@ -86,7 +86,7 @@ main(argc, argv) if (!(shell = getenv("SHELL"))) shell = _PATH_BSHELL; - execlp(shell, shell, "-i", NULL); + execlp(shell, shell, "-i", (char *)NULL); err(1, "%s", shell); /* NOTREACHED */ } diff --git a/usr.sbin/cron/crontab/crontab.c b/usr.sbin/cron/crontab/crontab.c index 3ff3e7dbfa40..d070cd776139 100644 --- a/usr.sbin/cron/crontab/crontab.c +++ b/usr.sbin/cron/crontab/crontab.c @@ -408,7 +408,7 @@ edit_cmd() { err(ERROR_EXIT, "chdir(/tmp)"); if (strlen(editor) + strlen(Filename) + 2 >= MAX_TEMPSTR) errx(ERROR_EXIT, "editor or filename too long"); - execlp(editor, editor, Filename, NULL); + execlp(editor, editor, Filename, (char *)NULL); err(ERROR_EXIT, "%s", editor); /*NOTREACHED*/ default: diff --git a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c index 932cd43eea87..b5a1411adeb4 100644 --- a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c +++ b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c @@ -185,7 +185,7 @@ run_sendmail(int ifd) case 0: /* Child */ dup2(ifd, 0); - execl(_PATH_SENDMAIL, _PATH_SENDMAIL, "-odq", "-t", NULL); + execl(_PATH_SENDMAIL, _PATH_SENDMAIL, "-odq", "-t", (char *)NULL); err("*exec: %s", _PATH_SENDMAIL); _exit(1); diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index 874325f73fec..71dcd1b8b7a7 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -385,7 +385,7 @@ editit(tmpfile) setuid(getuid()); if ((ed = getenv("EDITOR")) == (char *)0) ed = _PATH_VI; - execlp(ed, ed, tmpfile, 0); + execlp(ed, ed, tmpfile, (char *)0); err(1, "%s", ed); } waitpid(pid, &stat, 0); diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c index b692315b1856..5def73011ccb 100644 --- a/usr.sbin/kgzip/kgzcmp.c +++ b/usr.sbin/kgzip/kgzcmp.c @@ -136,7 +136,7 @@ mk_data(const struct iodesc * idi, const struct iodesc * ido, close(idi->fd); dup2(ido->fd, STDOUT_FILENO); close(ido->fd); - execlp("gzip", "gzip", "-9", NULL); + execlp("gzip", "gzip", "-9", (char *)NULL); warn(NULL); _exit(1); default: diff --git a/usr.sbin/kgzip/kgzld.c b/usr.sbin/kgzip/kgzld.c index 3e1d2d14f219..4f6acc852c14 100644 --- a/usr.sbin/kgzip/kgzld.c +++ b/usr.sbin/kgzip/kgzld.c @@ -85,10 +85,10 @@ kgzld(struct kgz_hdr * kh, const char *f1, const char *f2) case 0: if (format == F_AOUT) execlp("ld", "ld", "-aout", "-Z", "-T", addr, "-o", f2, - loader, f1, NULL); + loader, f1, (char *)NULL); else execlp("ld", "ld", "-Ttext", addr, "-o", f2, loader, f1, - NULL); + (char *)NULL); warn(NULL); _exit(1); default: diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index b46d2782f304..66565f6061ff 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -650,7 +650,7 @@ print(struct printer *pp, int format, char *file) execl(_PATH_PR, "pr", width, length, "-h", *title ? title : " ", "-L", *locale ? locale : "C", - "-F", 0); + "-F", (char *)0); syslog(LOG_ERR, "cannot execl %s", _PATH_PR); exit(2); } @@ -1315,7 +1315,7 @@ sendmail(struct printer *pp, char *user, int bombed) cp++; else cp = _PATH_SENDMAIL; - execl(_PATH_SENDMAIL, cp, "-t", 0); + execl(_PATH_SENDMAIL, cp, "-t", (char *)0); _exit(0); } else if (s > 0) { /* parent */ dup2(p[1], 1); @@ -1512,7 +1512,8 @@ openpr(const struct printer *pp) cp = pp->filters[LPF_OUTPUT]; else cp++; - execl(pp->filters[LPF_OUTPUT], cp, width, length, 0); + execl(pp->filters[LPF_OUTPUT], cp, width, length, + (char *)0); syslog(LOG_ERR, "%s: %s: %m", pp->printer, pp->filters[LPF_OUTPUT]); exit(1); diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c index f2a4e4d66abd..6c06d77dc159 100644 --- a/usr.sbin/newsyslog/newsyslog.c +++ b/usr.sbin/newsyslog/newsyslog.c @@ -672,7 +672,7 @@ compress_log(char *log) if (pid < 0) err(1, "fork"); else if (!pid) { - (void) execl(_PATH_GZIP, _PATH_GZIP, "-f", tmp, 0); + (void) execl(_PATH_GZIP, _PATH_GZIP, "-f", tmp, (char *)0); err(1, _PATH_GZIP); } } diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c index d1e410079ee3..216d10fd31d0 100644 --- a/usr.sbin/pkg_install/lib/file.c +++ b/usr.sbin/pkg_install/lib/file.c @@ -225,7 +225,8 @@ fileGetURL(char *base, char *spec) dup2(pfd[0], 0); for (fd = getdtablesize() - 1; fd >= 3; --fd) close(fd); - execl("/usr/bin/tar", "tar", Verbose ? "-xzvf" : "-xzf", "-", 0); + execl("/usr/bin/tar", "tar", Verbose ? "-xzvf" : "-xzf", "-", + (char *)0); _exit(2); } close(pfd[0]); diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c index b59b9f952f4e..01ba43a0d770 100644 --- a/usr.sbin/pw/pw.c +++ b/usr.sbin/pw/pw.c @@ -248,7 +248,7 @@ main(int argc, char *argv[]) warn("fork()"); else if (pid == 0) { /* Is make anywhere else? */ - execlp("/usr/bin/make", "make", NULL); + execlp("/usr/bin/make", "make", (char *)NULL); _exit(1); } else { int i; diff --git a/usr.sbin/rpc.yppasswdd/pw_util.c b/usr.sbin/rpc.yppasswdd/pw_util.c index 3f783c155057..a93a63054fc8 100644 --- a/usr.sbin/rpc.yppasswdd/pw_util.c +++ b/usr.sbin/rpc.yppasswdd/pw_util.c @@ -152,10 +152,11 @@ char *username; install_reaper(0); if (!(pid = vfork())) { if(!username) { - execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", tempname, NULL); + execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", tempname, + (char *)NULL); } else { execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-u", username, - tempname, NULL); + tempname, (char *)NULL); } pw_error(_PATH_PWD_MKDB, 1, 1); return(-1); diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c index d9cac7df6334..2e0b0929a2e9 100644 --- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c +++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c @@ -651,10 +651,10 @@ cleaning up and bailing out"); case 0: if (inplace && !rval) { execlp(MAP_UPDATE_PATH, MAP_UPDATE, passfile, - yppasswd_domain, "pushpw", NULL); + yppasswd_domain, "pushpw", (char *)NULL); } else { execlp(MAP_UPDATE_PATH, MAP_UPDATE, passfile, - yppasswd_domain, NULL); + yppasswd_domain, (char *)NULL); } yp_error("couldn't exec map update process: %s", strerror(errno)); @@ -841,10 +841,10 @@ cleaning up and bailing out"); case 0: if (inplace && !rval) { execlp(MAP_UPDATE_PATH, MAP_UPDATE, passfile, - argp->domain, "pushpw", NULL); + argp->domain, "pushpw", (char *)NULL); } else { execlp(MAP_UPDATE_PATH, MAP_UPDATE, passfile, - argp->domain, NULL); + argp->domain, (char *)NULL); } yp_error("couldn't exec map update process: %s", strerror(errno)); diff --git a/usr.sbin/rpc.ypupdated/update.c b/usr.sbin/rpc.ypupdated/update.c index 996347b429de..376743b3f5d6 100644 --- a/usr.sbin/rpc.ypupdated/update.c +++ b/usr.sbin/rpc.ypupdated/update.c @@ -193,7 +193,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.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c index c906deceefea..8fb1eba3e070 100644 --- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c +++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c @@ -57,7 +57,7 @@ static int yp_domake(map, domain) switch((pid = fork())) { case 0: - execlp(MAP_UPDATE_PATH, MAP_UPDATE, map, domain, NULL); + execlp(MAP_UPDATE_PATH, MAP_UPDATE, map, domain, (char *)NULL); yp_error("couldn't exec map update process: %s", strerror(errno)); exit(1); diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 43dd7025ad37..ae3b7bbb2937 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/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/sade/system.c b/usr.sbin/sade/system.c index b222d706d673..dbf0dc5b4245 100644 --- a/usr.sbin/sade/system.c +++ b/usr.sbin/sade/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; } diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 43dd7025ad37..ae3b7bbb2937 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 b2eb519c06c0..789d0a69956a 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 73600bfae44e..e7e6c2f79e45 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 b222d706d673..dbf0dc5b4245 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; } diff --git a/usr.sbin/vipw/pw_util.c b/usr.sbin/vipw/pw_util.c index c6c70ffb3e99..ce9eba229afc 100644 --- a/usr.sbin/vipw/pw_util.c +++ b/usr.sbin/vipw/pw_util.c @@ -174,11 +174,11 @@ char *username; if(!username) { warnx("rebuilding the database..."); execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d", mppath, - tempname, NULL); + tempname, (char *)NULL); } else { warnx("updating the database..."); execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d", mppath, - "-u", username, tempname, NULL); + "-u", username, tempname, (char *)NULL); } pw_error(_PATH_PWD_MKDB, 1, 1); } @@ -209,7 +209,7 @@ pw_edit(notsetuid) (void)setuid(getuid()); } errno = 0; - execlp(editor, p, tempname, NULL); + execlp(editor, p, tempname, (char *)NULL); _exit(errno); } for (;;) { diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c index aa95bba1bc62..774e1adf9d3e 100644 --- a/usr.sbin/ypserv/yp_server.c +++ b/usr.sbin/ypserv/yp_server.c @@ -380,7 +380,7 @@ ypproc_xfr_2_svc(ypreq_xfr *argp, struct svc_req *rqstp) "-p", yp_dir, "-C", t, g, inet_ntoa(rqhost->sin_addr), p, argp->map_parms.map, - NULL); + (char *)NULL); } else { execl(ypxfr_command, "ypxfr", "-d", argp->map_parms.domain, @@ -388,7 +388,7 @@ ypproc_xfr_2_svc(ypreq_xfr *argp, struct svc_req *rqstp) "-C", t, g, inet_ntoa(rqhost->sin_addr), p, argp->map_parms.map, - NULL); + (char *)NULL); } yp_error("ypxfr execl(%s): %s", ypxfr_command, strerror(errno)); YPXFR_RETURN(YPXFR_XFRERR) |