Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-28 14:29:51 +00:00
Code Issues Projects Releases Wiki Activity

Patch from Shaun Jackman moving the var=value logic to here it can do some good.

Browse Source
This commit is contained in:
Rob Landley 2006-07-01 17:19:02 +00:00
parent 7ccb65f3a4
commit 7a8e491dff
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/lash.c
View File

@ -1171,12 +1171,6 @@ static int pseudo_exec(struct child_prog *child)
{
struct built_in_command *x;
/* Check if the command sets an environment variable. */
if( strchr(child->argv[0], '=') != NULL ) {
child->argv[1] = child->argv[0];
_exit(builtin_export(child));
}
/* Check if the command matches any of the non-forking builtins.
* Depending on context, this might be redundant. But it's
* easier to waste a few CPU cycles than it is to figure out
@ -1300,6 +1294,12 @@ static int run_command(struct job *newjob, int inbg, int outpipe[2])
* is doomed to failure, and doesn't work on bash, either.
*/
if (newjob->num_progs == 1) {
/* Check if the command sets an environment variable. */
if (strchr(child->argv[0], '=') != NULL) {
child->argv[1] = child->argv[0];
return builtin_export(child);
}
for (x = bltins; x->cmd; x++) {
if (strcmp(child->argv[0], x->cmd) == 0 ) {
int rcode;