d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Band-aid for the "^C kills the editor" problem. I haven't yet found the

Browse Source 
proper way to fix this.  The way this works is to prepend "exec " to
the editor command to eliminate the "shell in the middle" which prevents
us from properly reawakening the editor after a SIGTSTP.

PR:		bin/50679
This commit is contained in:
Dag-Erling Smørgrav 2003-04-08 18:04:30 +00:00
parent 71ec78e340
commit c794881f8c
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libutil/pw_util.c
View File

@ -290,7 +290,6 @@ pw_edit(int notsetuid)
struct stat st1, st2;
const char *editor;
char *editcmd;
int editcmdlen;
int pstat;
if ((editor = getenv("EDITOR")) == NULL)
@ -306,14 +305,8 @@ pw_edit(int notsetuid)
(void)setgid(getgid());
(void)setuid(getuid());
}
if ((editcmdlen = sysconf(_SC_ARG_MAX) - 6) <= 0 ||
(editcmd = malloc(editcmdlen)) == NULL)
if (asprintf(&editcmd, "exec %s %s", editor, tempname) == NULL)
_exit(EXIT_FAILURE);
if (snprintf(editcmd, editcmdlen, "%s %s",
editor, tempname) >= editcmdlen) {
free(editcmd); /* pedantry */
_exit(EXIT_FAILURE);
}
errno = 0;
execl(_PATH_BSHELL, "sh", "-c", editcmd, NULL);
free(editcmd);
@ -322,13 +315,16 @@ pw_edit(int notsetuid)
/* parent */
break;
}
setpgid(editpid, editpid);
tcsetpgrp(1, editpid);
for (;;) {
editpid = waitpid(editpid, &pstat, WUNTRACED);
if (editpid == -1) {
if (waitpid(editpid, &pstat, WUNTRACED) == -1) {
unlink(tempname);
return (-1);
} else if (WIFSTOPPED(pstat)) {
raise(WSTOPSIG(pstat));
tcsetpgrp(1, getpgid(editpid));
kill(editpid, SIGCONT);
} else if (WIFEXITED(pstat) && WEXITSTATUS(pstat) == 0) {
editpid = -1;
break;