emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from vodz to only setenv PATH when PATH changes, which is much

Browse Source 
smarter than my quick fix.
This commit is contained in:
Eric Andersen 2002-06-06 12:07:28 +00:00
parent e90e741b1e
commit 1a92376f00
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/ash.c
View File

@ -3841,6 +3841,8 @@ changepath(const char *newval)
builtinloc = bltin; /* zap builtins */ builtinloc = bltin; /* zap builtins */
clearcmdentry(firstchange); clearcmdentry(firstchange);
builtinloc = bltin; builtinloc = bltin;
/* Ensure that getenv("PATH") stays current */
setenv("PATH", newval, 1);
} }
@ -4111,8 +4113,6 @@ path_change(const char *newval, int *bltin)
} }
if (builtinloc >= 0 && *bltin < 0) if (builtinloc >= 0 && *bltin < 0)
firstchange = 0; firstchange = 0;
/* Ensure that getenv("PATH") stays current */
setenv("PATH", newval, 1);
return firstchange; return firstchange;
} }
/* /*
@ -12442,7 +12442,7 @@ findvar(struct var **vpp, const char *name)
/* /*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org> * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin. * This file contains code for the times builtin.
* $Id: ash.c,v 1.51 2002/06/04 20:10:15 sandman Exp $ * $Id: ash.c,v 1.52 2002/06/06 12:07:28 andersen Exp $
*/ */
static int timescmd (int argc, char **argv) static int timescmd (int argc, char **argv)
{ {