summaryrefslogtreecommitdiffstats
path: root/Functions
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-01-09 22:37:22 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2015-01-10 10:32:31 -0800
commit199581f7803795a521be0d37c462fd7c3a6506a1 (patch)
tree55f5166b868c4dcb66777dbcd1d2c43a287f1cb6 /Functions
parentusers/19721: clarify context vs. style in compsys configuration (diff)
downloadzsh-199581f7803795a521be0d37c462fd7c3a6506a1.tar
zsh-199581f7803795a521be0d37c462fd7c3a6506a1.tar.gz
zsh-199581f7803795a521be0d37c462fd7c3a6506a1.tar.bz2
zsh-199581f7803795a521be0d37c462fd7c3a6506a1.tar.lz
zsh-199581f7803795a521be0d37c462fd7c3a6506a1.tar.xz
zsh-199581f7803795a521be0d37c462fd7c3a6506a1.tar.zst
zsh-199581f7803795a521be0d37c462fd7c3a6506a1.zip
34202: safe tempfile creation part 3 -- use zf_ln instead of mv
Diffstat (limited to 'Functions')
-rw-r--r--Functions/Calendar/calendar3
-rw-r--r--Functions/Zftp/zfget_match5
2 files changed, 5 insertions, 3 deletions
diff --git a/Functions/Calendar/calendar b/Functions/Calendar/calendar
index 39fc4313c..0d651dc10 100644
--- a/Functions/Calendar/calendar
+++ b/Functions/Calendar/calendar
@@ -12,6 +12,7 @@ local -A reply
zmodload -i zsh/datetime || return 1
zmodload -i zsh/zutil || return 1
+zmodload -m -F zsh/files b:zf_ln || return 1
autoload -Uz calendar_{add,parse,read,scandate,show,lockfiles}
@@ -254,7 +255,7 @@ if (( verbose )); then
fi
local mycmds="${TMPPREFIX:-/tmp/zsh}.calendar_cmds.$$"
-mv -f =(<<<'') $mycmds
+zf_ln -fn =(<<<'') $mycmds || return 1
# start of subshell for OS file locking
(
diff --git a/Functions/Zftp/zfget_match b/Functions/Zftp/zfget_match
index 3ba06c47a..3f2bbf30c 100644
--- a/Functions/Zftp/zfget_match
+++ b/Functions/Zftp/zfget_match
@@ -1,6 +1,7 @@
# function zfget_match {
emulate -L zsh
+zmodload -m -F zsh/files b:zf_ln || return 1
# the zfcd hack: this may not be necessary here
if [[ $1 == $HOME || $1 == $HOME/* ]]; then
@@ -10,8 +11,8 @@ fi
if [[ $ZFTP_SYSTEM == UNIX* && $1 == */* ]]; then
setopt localoptions clobber
local tmpf=${TMPPREFIX}zfgm$$
- mv -f =(<<<'') $tmpf
-
+ zf_ln -fn =(<<<'') $tmpf || return 1
+
if [[ -n $WIDGET ]]; then
local dir=${1:h}
[[ $dir = */ ]] || dir="$dir/"