mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-03 09:00:21 +00:00
Code Issues Releases Activity

Move first PATH initialization after sensing for interactive,

Browse Source 
first relative path warning was disabled in old case
This commit is contained in:
Andrey A. Chernov 1995-07-07 23:14:36 +00:00
parent f70e927c09
commit e985fb8ec7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=9434
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/csh/csh.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: csh.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp $
* $Id: csh.c,v 1.4 1995/07/07 22:45:26 ache Exp $
*/
#ifndef lint
@ -248,14 +248,6 @@ main(argc, argv)
if ((tcp = getenv("TERM")) != NULL)
set(STRterm, SAVE(tcp));
/*
* Re-initialize path if set in environment
*/
if ((tcp = getenv("PATH")) == NULL)
set1(STRpath, defaultpath(), &shvhed);
else
importpath(SAVE(tcp));
set(STRshell, Strsave(STR_SHELLPATH));
doldol = putn((int) getpid()); /* For $$ */
@ -417,6 +409,16 @@ main(argc, argv)
stderror(ERR_SYSTEM, "csh", strerror(errno));
}
}
/*
* Re-initialize path if set in environment
* importpath uses intty and intact
*/
if ((tcp = getenv("PATH")) == NULL)
set1(STRpath, defaultpath(), &shvhed);
else
importpath(SAVE(tcp));
/*
* Decide whether we should play with signals or not. If we are explicitly
* told (via -i, or -) or we are a login shell (arg0 starts with -) or the
@ -618,7 +620,7 @@ importpath(cp)
for (;;) {
if ((c = *dp) == ':' || c == 0) {
*dp = 0;
if ((*cp != '/' || *cp == '\0') && (euid == 0 || uid == 0) &&
if (*cp != '/' && (euid == 0 || uid == 0) &&
(intact || intty && isatty(SHOUT)))
(void) fprintf(csherr,
"Warning: imported path contains relative components\n");