summaryrefslogtreecommitdiff
path: root/src/password-store.sh
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2012-09-11 17:07:59 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2012-09-11 17:55:23 +0200
commitf423a27d4da8a1b830e368d846880886470b22dd (patch)
tree409fd30c4fab6b596bad6f4d55073dd8cfea6e5a /src/password-store.sh
parent8774bb4ebbe2ef19a846b84d41de956a848800dc (diff)
downloadpass-f423a27d4da8a1b830e368d846880886470b22dd.tar.gz
pass-f423a27d4da8a1b830e368d846880886470b22dd.tar.bz2
pass-f423a27d4da8a1b830e368d846880886470b22dd.zip
Use portable mktemp.1.2.1
Only GNU systems have --tmpdir, so for other systems we use the TMPDIR environment variable. Reported-by: Alexis <surryhill@gmail.com>
Diffstat (limited to '')
-rwxr-xr-xsrc/password-store.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/password-store.sh b/src/password-store.sh
index 8ca8c42..b5b657f 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -201,9 +201,10 @@ case "$command" in
path="$1"
mkdir -p -v "$PREFIX/$(dirname "$path")"
passfile="$PREFIX/$path.gpg"
+ template="$program.XXXXXXXXXXXXX"
if [ -d /dev/shm -a -w /dev/shm -a -x /dev/shm ]; then
- tmp_dir="$(mktemp -d --tmpdir=/dev/shm)"
+ tmp_dir="$(TMPDIR=/dev/shm mktemp -t $template -d)"
else
echo "Your system does not have /dev/shm, which means that it may"
echo "be difficult to entirely erase the temporary non-encrypted"
@@ -213,9 +214,9 @@ case "$command" in
if ! [[ $yesno == "y" || $yesno == "Y" ]]; then
exit 1
fi
- tmp_dir="$(mktemp -d)"
+ tmp_dir="$(mktemp -t $template -d)"
fi
- tmp_file="$(mktemp --tmpdir="$tmp_dir")"
+ tmp_file="$(TMPDIR="$tmp_dir" mktemp -t $template)"
action="Added"
if [[ -f $passfile ]]; then
es + callback functions into shared.cLars Hjemli4-82/+86 Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-11Move functions for generic object output into ui-view.cLars Hjemli4-34/+43 Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-11Move log-functions into ui-log.cLars Hjemli5-111/+121 Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-11Move repo summary functions into ui-summary.cLars Hjemli4-47/+59 Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-11Move functions for repolist output into ui-repolist.cLars Hjemli5-70/+90 Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-11Move common output-functions into ui-shared.cLars Hjemli4-82/+99 While at it, replace the cgit_[lib_]error constants with a proper function Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-11Rename config.c to parsing.c + move cgit_parse_query from cgit.c to parsing.cLars Hjemli4-28/+29 Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-11Avoid infinite loops in caching layerLars Hjemli3-14/+31 Add a global variable, cgit_max_lock_attemps, to avoid the possibility of infinite loops when failing to acquire a lockfile. This could happen on broken setups or under crazy server load. Incidentally, this also fixes a lurking bug in cache_lock() where an uninitialized returnvalue was used. Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-11Let 'make install' clear all cachefilesLars Hjemli1-0/+2 Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-11Fix cache algorithm loopholeLars Hjemli3-11/+16 This closes the door for unneccessary calls to cgit_fill_cache(). Noticed by Linus. Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-10Add version identifier in generated filesLars Hjemli2-9/+14 Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-10Add license file and copyright noticesLars Hjemli5-0/+372 Signed-off-by: Lars Hjemli <hjemli@gmail.com> 2006-12-10Add caching infrastructureLars Hjemli9-28/+353 This enables internal caching of page output. Page requests are split into four groups: 1) repo listing (front page) 2) repo summary 3) repo pages w/symbolic references in query string 4) repo pages w/constant sha1's in query string Each group has a TTL specified in minutes. When a page is requested, a cached filename is stat(2)'ed and st_mtime is compared to time(2). If TTL has expired (or the file didn't exist), the cached file is regenerated. When generating a cached file, locking is used to avoid parallell processing of the request. If multiple processes tries to aquire the same lock, the ones who fail to get the lock serves the (expired) cached file. If the cached file don't exist, the process instead calls sched_yield(2) before restarting the request processing. Signed-off-by: Lars Hjemli <hjemli@gmail.com>