emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/vipw.c, src/su.c, src/newgrp.c: Harmonize the children's

Browse Source 
SIGSTOP handling. Raise the signal which stopped the child instead
	of always SIGSTOP.

	Import Debian patch 406_vipw_resume_properly.
	Thanks to Dean Gaudet.
	* NEWS, src/vipw.c: Resume properly after ^Z.
This commit is contained in:
nekral-guest
2008-05-18 13:41:56 +00:00
parent c7302b61ef
commit 6a17c2b27f
5 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrp.c
View File

@ -294,7 +294,7 @@ static void syslog_sg (const char *name, const char *group)
pid = waitpid (child, &cst, WUNTRACED);
if (pid == child && WIFSTOPPED (cst)) {
/* stop when child stops */
raise (SIGSTOP);
kill (getpid (), WSTOPSIG(status));
/* wake child when resumed */
kill (child, SIGCONT);
}

8
src/su.c
View File

@ -238,9 +238,11 @@ static void run_shell (const char *shellstr, char *args[], int doshell,
pid = waitpid (-1, &status, WUNTRACED);
if (WIFSTOPPED (status)) {
kill (getpid (), SIGSTOP);
/* once we get here, we must have resumed */
if ((pid != -1) && WIFSTOPPED (status)) {
/* The child (shell) was suspended.
* Suspend su. */
kill (getpid (), WSTOPSIG(status));
/* wake child when resumed */
kill (pid, SIGCONT);
}
} while (WIFSTOPPED (status));

9
src/vipw.c
View File

@ -209,9 +209,12 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (void))
for (;;) {
pid = waitpid (pid, &status, WUNTRACED);
if (WIFSTOPPED (status)) {
kill (getpid (), SIGSTOP);
kill (getpid (), SIGCONT);
if ((pid != -1) && WIFSTOPPED (status)) {
/* The child (editor) was suspended.
* Suspend vipw. */
kill (getpid (), WSTOPSIG(status));
/* wake child when resumed */
kill (pid, SIGCONT);
} else
break;
}