summaryrefslogtreecommitdiff
path: root/Functions/Zftp
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-12-28 00:49:08 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2014-12-28 00:49:08 -0800
commit33b395806470eeac408070fec535bfd5efc20a2c (patch)
tree460b4348ea6401c36bd3488a0bf3fe12f9b4d7c4 /Functions/Zftp
parent200accac63deae99eb9656b26363c85648bd6748 (diff)
downloadzsh-33b395806470eeac408070fec535bfd5efc20a2c.tar.gz
zsh-33b395806470eeac408070fec535bfd5efc20a2c.zip
34068: create tempfiles without forking, and safe temp directory creation
Diffstat (limited to 'Functions/Zftp')
-rw-r--r--Functions/Zftp/zfcd_match2
-rw-r--r--Functions/Zftp/zfcget2
-rw-r--r--Functions/Zftp/zfcput2
-rw-r--r--Functions/Zftp/zfget_match2
-rw-r--r--Functions/Zftp/zfrglob4
-rw-r--r--Functions/Zftp/zftransfer2
-rw-r--r--Functions/Zftp/zfuget2
-rw-r--r--Functions/Zftp/zfuput2
8 files changed, 9 insertions, 9 deletions
diff --git a/Functions/Zftp/zfcd_match b/Functions/Zftp/zfcd_match
index 2c809c20f..9159f496c 100644
--- a/Functions/Zftp/zfcd_match
+++ b/Functions/Zftp/zfcd_match
@@ -29,7 +29,7 @@ if [[ $ZFTP_SYSTEM = UNIX* ]]; then
# () {
# zftp ls -LF $dir >|$1
# reply=($(awk '/\/$/ { print substr($1, 1, length($1)-1) }' $1))
-# } =(:)
+# } =(<<<'')
[[ -n $dir && $dir != */ ]] && dir="$dir/"
if [[ -n $WIDGET ]]; then
_wanted directories expl 'remote directory' \
diff --git a/Functions/Zftp/zfcget b/Functions/Zftp/zfcget
index 435980113..569ee9de1 100644
--- a/Functions/Zftp/zfcget
+++ b/Functions/Zftp/zfcget
@@ -43,7 +43,7 @@ for remlist in $*; do
zftp remote $rem >|$1
rstat=$?
remst=($(<$1))
- } =(: temporary file)
+ } =(<<<'temporary file')
if [[ $rstat = 2 ]]; then
print "Server does not support SIZE command.\n" \
"Assuming you know what you're doing..." 2>&1
diff --git a/Functions/Zftp/zfcput b/Functions/Zftp/zfcput
index 2cf8fe2d2..eafecde78 100644
--- a/Functions/Zftp/zfcput
+++ b/Functions/Zftp/zfcput
@@ -43,7 +43,7 @@ for loc in $*; do
zftp remote $rem >|$1
rstat=$?
remst=($(<$1))
- } =(: temporary file)
+ } =(<<<'temporary file')
if [[ $rstat = 2 ]]; then
print "Server does not support remote status commands.\n" \
"You will have to find out the size by hand and use zftp append." 2>&1
diff --git a/Functions/Zftp/zfget_match b/Functions/Zftp/zfget_match
index c2871fa16..3ba06c47a 100644
--- a/Functions/Zftp/zfget_match
+++ b/Functions/Zftp/zfget_match
@@ -10,7 +10,7 @@ fi
if [[ $ZFTP_SYSTEM == UNIX* && $1 == */* ]]; then
setopt localoptions clobber
local tmpf=${TMPPREFIX}zfgm$$
- mv -f =(:) $tmpf
+ mv -f =(<<<'') $tmpf
if [[ -n $WIDGET ]]; then
local dir=${1:h}
diff --git a/Functions/Zftp/zfrglob b/Functions/Zftp/zfrglob
index 5015be77b..677b85f4b 100644
--- a/Functions/Zftp/zfrglob
+++ b/Functions/Zftp/zfrglob
@@ -38,7 +38,7 @@ if [[ $zfrglob != '' ]]; then
() {
zftp ls "$pat" >|$1 2>/dev/null
eval "$1=(\$(<\$1))"
- } =(: temporary file)
+ } =(<<<'temporary file')
else
if [[ $ZFTP_SYSTEM = UNIX* && $pat = */* ]]; then
# not the current directory and we know how to handle paths
@@ -52,7 +52,7 @@ else
() {
zftp ls "$dir" 2>/dev/null >|$1
files=($(<$1))
- } =(: temporary file)
+ } =(<<<'temporary file')
files=(${files:t})
else
# we just have to do an ls and hope that's right
diff --git a/Functions/Zftp/zftransfer b/Functions/Zftp/zftransfer
index 432e2f584..c97ae4645 100644
--- a/Functions/Zftp/zftransfer
+++ b/Functions/Zftp/zftransfer
@@ -47,7 +47,7 @@ if [[ -n $style && $style != none ]]; then
() {
zftp remote $file1 >|$1 2>/dev/null
array=($(<$1))
- } =(: temporary file)
+ } =(<<<'temporary file')
[[ $#array -eq 2 ]] && ZFTP_TSIZE=$array[1]
fi
diff --git a/Functions/Zftp/zfuget b/Functions/Zftp/zfuget
index 7bdaedc47..2850975e7 100644
--- a/Functions/Zftp/zfuget
+++ b/Functions/Zftp/zfuget
@@ -72,7 +72,7 @@ for remlist in $*; do
zftp remote $rem >|$1
rstat=$?
remstats=($(<$1))
- } =(: temporary file)
+ } =(<<<'temporary file')
if [[ $rstat = 2 ]]; then
print "Server does not implement full command set required." 1>&2
return 1
diff --git a/Functions/Zftp/zfuput b/Functions/Zftp/zfuput
index 24a355931..f4e6a0fd6 100644
--- a/Functions/Zftp/zfuput
+++ b/Functions/Zftp/zfuput
@@ -58,7 +58,7 @@ for rem in $*; do
zftp remote $rem >|$1
rstat=$?
remstats=($(<$1))
- } =(: temporary file)
+ } =(<<<'temporary file')
if [[ $rstat = 2 ]]; then
print "Server does not implement full command set required." 1>&2
return 1