summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-02-20 11:20:51 -0800
committerNick Kralevich <nnk@google.com>2013-02-20 11:47:46 -0800
commitfd187c65783f5032a49eace50b115495b051cd73 (patch)
treee27b184e6daf7a91e6d1f9ae1fc549ec8abe6e0a
parentd2cea5b5036afed5295d9eb5657772d7a607351c (diff)
downloadmksh-fd187c65783f5032a49eace50b115495b051cd73.tar.gz
mksh: use /data/local instead of /data/local/tmp
/data/local/tmp is writable by the shell user and is not sticky (S_IXVTX). /data/local is only writable by root (as a result, the sticky bit doesn't matter). Change-Id: I7ea121208846c2cffe97f6316272c526b47a1813
-rw-r--r--Android.mk2
-rw-r--r--mkmf.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 7855926..0d8807e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,7 +36,7 @@ LOCAL_C_INCLUDES:= $(LOCAL_PATH)/src
# additional flags first, then from Makefrag.inc: CFLAGS, CPPFLAGS
LOCAL_CFLAGS:= -DMKSHRC_PATH=\"/system/etc/mkshrc\" \
-DMKSH_DEFAULT_EXECSHELL=\"/system/bin/sh\" \
- -DMKSH_DEFAULT_TMPDIR=\"/data/local/tmp\" \
+ -DMKSH_DEFAULT_TMPDIR=\"/data/local\" \
-fno-asynchronous-unwind-tables -fwrapv \
-DDEBUG_LEAKS -DMKSH_ASSUME_UTF8 -DMKSH_CONSERVATIVE_FDS \
-DMKSH_DONT_EMIT_IDSTRING -DMKSH_NOPWNAM -DMKSH_BUILDSH \
diff --git a/mkmf.sh b/mkmf.sh
index 84e9845..6e2517c 100644
--- a/mkmf.sh
+++ b/mkmf.sh
@@ -149,7 +149,7 @@ addvar LIBS \
if test $mkmfmode = 1; then
addvar CPPFLAGS '-DMKSHRC_PATH=\"/system/etc/mkshrc\"'
addvar CPPFLAGS '-DMKSH_DEFAULT_EXECSHELL=\"/system/bin/sh\"'
- addvar CPPFLAGS '-DMKSH_DEFAULT_TMPDIR=\"/data/local/tmp\"'
+ addvar CPPFLAGS '-DMKSH_DEFAULT_TMPDIR=\"/data/local\"'
fi
### Override flags