2 files changed, 17 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 69fa5637c..ef124628b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
    - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh
      regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh
      regress/transfer.sh] Use ${EXEEXT} where appropriate.
+   - [regress/sftp.sh] Remove dependency on /dev/stdin.
 
 20030903
  - (djm) OpenBSD CVS Sync
@@ -1004,4 +1005,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2949 2003/09/04 04:54:39 dtucker Exp $
+$Id: ChangeLog,v 1.2950 2003/09/04 05:00:55 dtucker Exp $
diff --git a/regress/sftp.sh b/regress/sftp.sh
index 17a0a2b99..0e22f8f6b 100644
--- a/regress/sftp.sh
+++ b/regress/sftp.sh
@@ -6,24 +6,30 @@ tid="basic sftp put/get"
 DATA=/bin/ls${EXEEXT}
 COPY=${OBJ}/copy
 
+SFTPCMDFILE=${OBJ}/batch
+cat >$SFTPCMDFILE <<EOF
+version
+get $DATA ${COPY}.1
+put $DATA ${COPY}.2
+EOF
+
 BUFFERSIZE="5 1000 32000 64000"
 REQUESTS="1 2 10"
 
 for B in ${BUFFERSIZE}; do
         for R in ${REQUESTS}; do
                 verbose "test $tid: buffer_size $B num_requests $R"
-                rm -f ${COPY}.1 ${COPY}.2
-                ${SFTP} -P ${SFTPSERVER} -B $B -R $R -b /dev/stdin \
-                > /dev/null 2>&1 << EOF
-                version
-                get $DATA ${COPY}.1
-                put $DATA ${COPY}.2
-EOF
+                rm -f ${COPY}.1 ${COPY}.2                
+                ${SFTP} -P ${SFTPSERVER} -B $B -R $R -b $SFTPCMDFILE \
+                > /dev/null 2>&1
                 r=$?
                 if [ $r -ne 0 ]; then
                         fail "sftp failed with $r"
+                else 
+                        cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
+                        cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
                 fi
-                cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
-                cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
         done
 done
+rm -f ${COPY}.1 ${COPY}.2                
+rm -f $SFTPCMDFILE