JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

integrate latest changes from oksh: Wed Sep 4 15:49:19 2013 UTC by millert

Browse Source 
Add a proper suspend builtin that saves/restores the tty and pgrp
as needed instead of an alias that just sends SIGSTOP.  Login shells
may be suspended if they are not running in an orphan process group.
This commit is contained in:
tg
2013-09-10 17:33:04 +00:00
parent 8352fc78d3
commit 2e7509548a
8 changed files with 112 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
funcs.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: c_ksh.c,v 1.33 2009/02/07 14:03:24 kili Exp $ */
/* $OpenBSD: c_sh.c,v 1.43 2013/04/19 17:39:45 deraadt Exp $ */
/* $OpenBSD: c_sh.c,v 1.44 2013/09/04 15:49:18 millert Exp $ */
/* $OpenBSD: c_test.c,v 1.18 2009/03/01 20:11:06 otto Exp $ */
/* $OpenBSD: c_ulimit.c,v 1.17 2008/03/21 12:51:19 millert Exp $ */
@ -38,7 +38,7 @@
#endif
#endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.245 2013/09/10 16:30:49 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.246 2013/09/10 17:33:00 tg Exp $");
#if HAVE_KILLPG
/*
@ -60,6 +60,10 @@ __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.245 2013/09/10 16:30:49 tg Exp $");
#define c_ulimit c_true
#endif
#ifndef MKSH_UNEMPLOYED
static int c_suspend(const char **);
#endif
/* getn() that prints error */
static int
bi_getn(const char *as, int *ai)
@ -123,6 +127,9 @@ const struct builtin mkshbuiltins[] = {
{"*=return", c_exitreturn},
{Tsgset, c_set},
{"*=shift", c_shift},
#ifndef MKSH_UNEMPLOYED
{"suspend", c_suspend},
#endif
{"test", c_test},
{"*=times", c_times},
{"*=trap", c_trap},
@ -3843,3 +3850,24 @@ c_sleep(const char **wp)
return (rv);
}
#endif
#ifndef MKSH_UNEMPLOYED
static int
c_suspend(const char **wp)
{
if (wp[1] != NULL) {
bi_errorf("too many arguments");
return (1);
}
if (Flag(FLOGIN)) {
/* Can't suspend an orphaned process group. */
if (getpgid(kshppid) == getpgid(0) ||
getsid(kshppid) != getsid(0)) {
bi_errorf("can't suspend a login shell");
return (1);
}
}
j_suspend();
return (0);
}
#endif