[src/trunk]: src/bin/sh PR/42828: Richard Hansen: Don't evaluate ${ENV} if no...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a6648226c82
branches:  trunk
changeset: 752161:9a6648226c82
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Feb 17 15:57:24 2010 +0000

description:
PR/42828: Richard Hansen: Don't evaluate ${ENV} if not interactive.
http://www.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_05_03

diffstat:

 bin/sh/main.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 489c71e2a0d8 -r 9a6648226c82 bin/sh/main.c
--- a/bin/sh/main.c     Wed Feb 17 15:54:10 2010 +0000
+++ b/bin/sh/main.c     Wed Feb 17 15:57:24 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.53 2009/01/18 00:30:54 lukem Exp $  */
+/*     $NetBSD: main.c,v 1.54 2010/02/17 15:57:24 christos Exp $       */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.7 (Berkeley) 7/19/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.53 2009/01/18 00:30:54 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.54 2010/02/17 15:57:24 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -184,7 +184,7 @@
        }
 state2:
        state = 3;
-       if (getuid() == geteuid() && getgid() == getegid()) {
+       if (iflag && getuid() == geteuid() && getgid() == getegid()) {
                if ((shinit = lookupvar("ENV")) != NULL && *shinit != '\0') {
                        state = 3;
                        read_profile(shinit);