summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/scp.sh10
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c2c0a6acd..0680b2201 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@
30 - (dtucker) [regress/dynamic-forward.sh] Allow time for connections to be torn 30 - (dtucker) [regress/dynamic-forward.sh] Allow time for connections to be torn
31 down, needed on some platforms, should be harmless on others. Patch from 31 down, needed on some platforms, should be harmless on others. Patch from
32 jason at devrandom.org. 32 jason at devrandom.org.
33 - (dtucker) [regress/scp.sh] Make this work on Cygwin too, which doesn't like
34 files ending in .exe that aren't binaries; patch from vinschen at redhat.com.
33 35
3420040828 3620040828
35 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from 37 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
@@ -1697,4 +1699,4 @@
1697 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1699 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1698 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1700 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1699 1701
1700$Id: ChangeLog,v 1.3531 2004/08/29 07:14:31 dtucker Exp $ 1702$Id: ChangeLog,v 1.3532 2004/08/29 09:39:09 dtucker Exp $
diff --git a/regress/scp.sh b/regress/scp.sh
index 703cc0893..6b5664283 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -12,16 +12,16 @@ else
12 DIFFOPT="-r" 12 DIFFOPT="-r"
13fi 13fi
14 14
15DATA=/bin/ls 15DATA=/bin/ls${EXEEXT}
16COPY=${OBJ}/copy 16COPY=${OBJ}/copy
17COPY2=${OBJ}/copy2 17COPY2=${OBJ}/copy2
18DIR=${COPY}.dd 18DIR=${COPY}.dd
19DIR2=${COPY}.dd2 19DIR2=${COPY}.dd2
20 20
21SRC=`dirname ${SCRIPT}` 21SRC=`dirname ${SCRIPT}`
22cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.exe 22cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp
23chmod 755 ${OBJ}/scp-ssh-wrapper.exe 23chmod 755 ${OBJ}/scp-ssh-wrapper.scp
24scpopts="-q -S ${OBJ}/scp-ssh-wrapper.exe" 24scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp"
25 25
26scpclean() { 26scpclean() {
27 rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2} 27 rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2}
@@ -79,4 +79,4 @@ for i in 0 1 2 3 4; do
79done 79done
80 80
81scpclean 81scpclean
82rm -f ${OBJ}/scp-ssh-wrapper.exe 82rm -f ${OBJ}/scp-ssh-wrapper.scp