summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2010-02-06 22:57:24 +0000
committerjilles <jilles@FreeBSD.org>2010-02-06 22:57:24 +0000
commit9c81a24436f4b19434a1d75bf5b592a13ad156c2 (patch)
tree9e9308576f99844cd3f9846a35a80d74607e5c0a
parent6d3ec806895e807566f3ba15226c51fc15c5e7a5 (diff)
downloadFreeBSD-src-9c81a24436f4b19434a1d75bf5b592a13ad156c2.zip
FreeBSD-src-9c81a24436f4b19434a1d75bf5b592a13ad156c2.tar.gz
sh: Do not stat() $MAIL/$MAILPATH in non-interactive shells.
These may be NFS mounted, and we should not touch them unless we are going to do something useful with the information.
-rw-r--r--bin/sh/main.c2
-rw-r--r--bin/sh/var.c7
-rw-r--r--tools/regression/bin/sh/parameters/mail1.015
-rw-r--r--tools/regression/bin/sh/parameters/mail2.015
4 files changed, 38 insertions, 1 deletions
diff --git a/bin/sh/main.c b/bin/sh/main.c
index ece63c8..50a8813 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -157,6 +157,8 @@ main(int argc, char *argv[])
out2fmt_flush("sh: cannot determine working directory\n");
if (getpwd() != NULL)
setvar ("PWD", getpwd(), VEXPORT);
+ if (iflag)
+ chkmail(1);
if (argv[0] && argv[0][0] == '-') {
state = 1;
read_profile("/etc/profile");
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 0a80604..d46e2c3 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -337,8 +337,13 @@ setvareq(char *s, int flags)
/*
* We could roll this to a function, to handle it as
* a regular variable function callback, but why bother?
+ *
+ * Note: this assumes iflag is not set to 1 initially.
+ * As part of init(), this is called before arguments
+ * are looked at.
*/
- if (vp == &vmpath || (vp == &vmail && ! mpathset()))
+ if ((vp == &vmpath || (vp == &vmail && ! mpathset())) &&
+ iflag == 1)
chkmail(1);
if ((vp->flags & VEXPORT) && localevar(s)) {
change_env(s, 1);
diff --git a/tools/regression/bin/sh/parameters/mail1.0 b/tools/regression/bin/sh/parameters/mail1.0
new file mode 100644
index 0000000..26308ea
--- /dev/null
+++ b/tools/regression/bin/sh/parameters/mail1.0
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Test that a non-interactive shell does not access $MAIL.
+
+goodfile=/var/empty/sh-test-goodfile
+mailfile=/var/empty/sh-test-mailfile
+T=$(mktemp sh-test.XXXXXX) || exit
+MAIL=$mailfile ktrace -i -f "$T" sh -c "[ -s $goodfile ]" 2>/dev/null
+if ! grep -q $goodfile "$T"; then
+ # ktrace problem
+ rc=0
+elif ! grep -q $mailfile "$T"; then
+ rc=0
+fi
+rm "$T"
+exit ${rc:-3}
diff --git a/tools/regression/bin/sh/parameters/mail2.0 b/tools/regression/bin/sh/parameters/mail2.0
new file mode 100644
index 0000000..4f14849
--- /dev/null
+++ b/tools/regression/bin/sh/parameters/mail2.0
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Test that an interactive shell accesses $MAIL.
+
+goodfile=/var/empty/sh-test-goodfile
+mailfile=/var/empty/sh-test-mailfile
+T=$(mktemp sh-test.XXXXXX) || exit
+MAIL=$mailfile ktrace -i -f "$T" sh +m -i </dev/null >/dev/null 2>&1
+if ! grep -q $goodfile "$T"; then
+ # ktrace problem
+ rc=0
+elif grep -q $mailfile "$T"; then
+ rc=0
+fi
+rm "$T"
+exit ${rc:-3}
OpenPOWER on IntegriCloud