This commit is contained in:
tg
2007-10-25 13:27:00 +00:00
parent 97ba2fabc7
commit 84e78bcfb6
2 changed files with 3 additions and 12 deletions

10
exec.c
View File

@ -2,7 +2,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.38 2007/09/09 18:06:40 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/exec.c,v 1.39 2007/10/25 13:27:00 tg Exp $");
static int comexec(struct op *, struct tbl *volatile, const char **, static int comexec(struct op *, struct tbl *volatile, const char **,
int volatile); int volatile);
@ -35,14 +35,6 @@ execute(struct op *volatile t,
if (t == NULL) if (t == NULL)
return 0; return 0;
/* Is this the end of a pipeline? If so, we want to evaluate the
* command arguments
bool eval_done = false;
if ((flags&XFORK) && !(flags&XEXEC) && (flags&XPCLOSE)) {
eval_done = true;
tp = eval_execute_args(t, &ap);
}
*/
if ((flags&XFORK) && !(flags&XEXEC) && t->type != TPIPE) if ((flags&XFORK) && !(flags&XEXEC) && t->type != TPIPE)
return exchild(t, flags & ~XTIME, -1); /* run in sub-process */ return exchild(t, flags & ~XTIME, -1); /* run in sub-process */

5
jobs.c
View File

@ -2,7 +2,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.28 2007/09/09 19:12:10 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.29 2007/10/25 13:27:00 tg Exp $");
/* Order important! */ /* Order important! */
#define PRUNNING 0 #define PRUNNING 0
@ -293,8 +293,7 @@ j_change(void)
/* execute tree in child subprocess */ /* execute tree in child subprocess */
int int
exchild(struct op *t, int flags, exchild(struct op *t, int flags, /* used if XPCLOSE or XCCLOSE */ int close_fd)
int close_fd) /* used if XPCLOSE or XCCLOSE */
{ {
static Proc *last_proc; /* for pipelines */ static Proc *last_proc; /* for pipelines */