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

Use my own version of system() everywhere - it knows where to find the

Browse Source 
shell!
This commit is contained in:
Jordan K. Hubbard 1995-05-18 02:42:33 +00:00
parent 384435b07d
commit 0b30383382
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=8584
6 changed files with 75 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/sysinstall/command.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: command.c,v 1.3 1995/05/16 02:52:56 jkh Exp $
* $Id: command.c,v 1.4 1995/05/16 11:37:07 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -166,7 +166,7 @@ command_execute(void)
if (commandStack[i]->cmds[j].type == CMD_SHELL) {
msgNotify("Executing command: %s",
commandStack[i]->cmds[j].ptr);
ret = system((char *)commandStack[i]->cmds[j].ptr);
ret = vsystem((char *)commandStack[i]->cmds[j].ptr);
msgDebug("Command `%s' returns status %d\n",
commandStack[i]->cmds[j].ptr, ret);
}

25
release/sysinstall/system.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: system.c,v 1.11 1995/05/16 11:37:26 jkh Exp $
* $Id: system.c,v 1.12 1995/05/17 16:16:10 jkh Exp $
*
* Jordan Hubbard
*
@ -265,6 +265,10 @@ int
vsystem(char *fmt, ...)
{
va_list args;
union wait pstat;
pid_t pid;
int omask;
sig_t intsave, quitsave;
char *cmd;
int i;
@ -273,8 +277,25 @@ vsystem(char *fmt, ...)
va_start(args, fmt);
vsnprintf(cmd, FILENAME_MAX, fmt, args);
va_end(args);
omask = sigblock(sigmask(SIGCHLD));
msgNotify("Executing command: %s", cmd);
i = system(cmd);
switch(pid = vfork()) {
case -1: /* error */
(void)sigsetmask(omask);
i = 127;
case 0: /* child */
(void)sigsetmask(omask);
execl("/stand/sh", "sh", "-c", cmd, (char *)NULL);
i = 127;
}
intsave = signal(SIGINT, SIG_IGN);
quitsave = signal(SIGQUIT, SIG_IGN);
pid = waitpid(pid, (int *)&pstat, 0);
(void)sigsetmask(omask);
(void)signal(SIGINT, intsave);
(void)signal(SIGQUIT, quitsave);
i = (pid == -1) ? -1 : pstat.w_status;
msgDebug("Command `%s' returns status of %d\n", cmd, i);
free(cmd);
return i;

4
usr.sbin/sade/command.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: command.c,v 1.3 1995/05/16 02:52:56 jkh Exp $
* $Id: command.c,v 1.4 1995/05/16 11:37:07 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -166,7 +166,7 @@ command_execute(void)
if (commandStack[i]->cmds[j].type == CMD_SHELL) {
msgNotify("Executing command: %s",
commandStack[i]->cmds[j].ptr);
ret = system((char *)commandStack[i]->cmds[j].ptr);
ret = vsystem((char *)commandStack[i]->cmds[j].ptr);
msgDebug("Command `%s' returns status %d\n",
commandStack[i]->cmds[j].ptr, ret);
}

25
usr.sbin/sade/system.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: system.c,v 1.11 1995/05/16 11:37:26 jkh Exp $
* $Id: system.c,v 1.12 1995/05/17 16:16:10 jkh Exp $
*
* Jordan Hubbard
*
@ -265,6 +265,10 @@ int
vsystem(char *fmt, ...)
{
va_list args;
union wait pstat;
pid_t pid;
int omask;
sig_t intsave, quitsave;
char *cmd;
int i;
@ -273,8 +277,25 @@ vsystem(char *fmt, ...)
va_start(args, fmt);
vsnprintf(cmd, FILENAME_MAX, fmt, args);
va_end(args);
omask = sigblock(sigmask(SIGCHLD));
msgNotify("Executing command: %s", cmd);
i = system(cmd);
switch(pid = vfork()) {
case -1: /* error */
(void)sigsetmask(omask);
i = 127;
case 0: /* child */
(void)sigsetmask(omask);
execl("/stand/sh", "sh", "-c", cmd, (char *)NULL);
i = 127;
}
intsave = signal(SIGINT, SIG_IGN);
quitsave = signal(SIGQUIT, SIG_IGN);
pid = waitpid(pid, (int *)&pstat, 0);
(void)sigsetmask(omask);
(void)signal(SIGINT, intsave);
(void)signal(SIGQUIT, quitsave);
i = (pid == -1) ? -1 : pstat.w_status;
msgDebug("Command `%s' returns status of %d\n", cmd, i);
free(cmd);
return i;

4
usr.sbin/sysinstall/command.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: command.c,v 1.3 1995/05/16 02:52:56 jkh Exp $
* $Id: command.c,v 1.4 1995/05/16 11:37:07 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -166,7 +166,7 @@ command_execute(void)
if (commandStack[i]->cmds[j].type == CMD_SHELL) {
msgNotify("Executing command: %s",
commandStack[i]->cmds[j].ptr);
ret = system((char *)commandStack[i]->cmds[j].ptr);
ret = vsystem((char *)commandStack[i]->cmds[j].ptr);
msgDebug("Command `%s' returns status %d\n",
commandStack[i]->cmds[j].ptr, ret);
}

25
usr.sbin/sysinstall/system.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: system.c,v 1.11 1995/05/16 11:37:26 jkh Exp $
* $Id: system.c,v 1.12 1995/05/17 16:16:10 jkh Exp $
*
* Jordan Hubbard
*
@ -265,6 +265,10 @@ int
vsystem(char *fmt, ...)
{
va_list args;
union wait pstat;
pid_t pid;
int omask;
sig_t intsave, quitsave;
char *cmd;
int i;
@ -273,8 +277,25 @@ vsystem(char *fmt, ...)
va_start(args, fmt);
vsnprintf(cmd, FILENAME_MAX, fmt, args);
va_end(args);
omask = sigblock(sigmask(SIGCHLD));
msgNotify("Executing command: %s", cmd);
i = system(cmd);
switch(pid = vfork()) {
case -1: /* error */
(void)sigsetmask(omask);
i = 127;
case 0: /* child */
(void)sigsetmask(omask);
execl("/stand/sh", "sh", "-c", cmd, (char *)NULL);
i = 127;
}
intsave = signal(SIGINT, SIG_IGN);
quitsave = signal(SIGQUIT, SIG_IGN);
pid = waitpid(pid, (int *)&pstat, 0);
(void)sigsetmask(omask);
(void)signal(SIGINT, intsave);
(void)signal(SIGQUIT, quitsave);
i = (pid == -1) ? -1 : pstat.w_status;
msgDebug("Command `%s' returns status of %d\n", cmd, i);
free(cmd);
return i;