diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-06 12:10:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-06 12:10:05 +0000 |
| commit | 95ce34efe94dfde536b356b88b5f27f3b7e7f383 (patch) | |
| tree | 8d0139ffd8d999fe7ab580cf24fe91153aec6dab /usr.sbin | |
| parent | ee305bb7990cf6945309f59e90e3a4ad3b30cbce (diff) | |
system() $EDITOR safely
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/edquota/edquota.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index 5c3c9ce01cf..a48cf5150dd 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -42,7 +42,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$Id: edquota.c,v 1.7 1996/06/06 12:00:55 deraadt Exp $"; +static char *rcsid = "$Id: edquota.c,v 1.8 1996/06/06 12:10:04 deraadt Exp $"; #endif /* not lint */ /* @@ -329,11 +329,21 @@ editit(tmpfile) int pid, stat; extern char *getenv(); + register char *ed; + char *p; + if ((ed = getenv("EDITOR")) == (char *)0) + ed = _PATH_VI; + p = (char *)malloc(strlen(ed) + 1 + strlen(tmpfile) + 1); + if (!p) + return (0); + sprintf(p, "%s %s", ed, tmpfile); + omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGHUP)); top: if ((pid = fork()) < 0) { extern errno; + free(p); if (errno == EPROCLIM) { fprintf(stderr, "You have too many processes\n"); return(0); @@ -346,20 +356,14 @@ editit(tmpfile) return (0); } if (pid == 0) { - register char *ed; - char *p; - sigsetmask(omask); setgid(getgid()); setuid(getuid()); - if ((ed = getenv("EDITOR")) == (char *)0) - ed = _PATH_VI; - p = (char *)malloc(strlen(ed) + 1 + strlen(tmpfile) + 1); - sprintf(p, "%s %s", ed, tmpfile); if (system(p) == -1) perror(ed); exit(1); } + free(p); waitpid(pid, &stat, 0); sigsetmask(omask); if (!WIFEXITED(stat) || WEXITSTATUS(stat) != 0) |