[openssh-commits] [openssh] branch master updated: avoid k suffix in dd count operand in sftp-resume test

git+noreply at mindrot.org git+noreply at mindrot.org
Wed Apr 1 16:51:59 AEDT 2026


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new fe86c3975 avoid k suffix in dd count operand in sftp-resume test
fe86c3975 is described below

commit fe86c39751d38eb9e9b03ace1e31aa4586ea6660
Author: Michael Forney <mforney at mforney.org>
AuthorDate: Wed Apr 1 12:09:00 2026 +1100

    avoid k suffix in dd count operand in sftp-resume test
    
    Not all dd implementations support this. POSIX only specifies
    suffixes for block size operands.
    
    Instead, just use 1024k to avoid the special case. This also removes
    an incorrect redirection operator that appeared in the 1m case.
---
 regress/sftp-resume.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/regress/sftp-resume.sh b/regress/sftp-resume.sh
index f4fe8f928..4ab0f1d68 100644
--- a/regress/sftp-resume.sh
+++ b/regress/sftp-resume.sh
@@ -10,7 +10,7 @@ increase_datafile_size 1200
 
 for cmd in put get; do
     verbose "$tid: ${cmd}"
-    for size in 0 1 1k 1m size-1 same; do
+    for size in 0 1 1k 1024k size-1 same; do
 	trace "$tid: test ${cmd} ${size}"
 	rm -rf ${COPY}.1 ${COPY}.2
 	cp ${DATA} ${COPY}.1
@@ -24,8 +24,6 @@ for cmd in put get; do
 		;;
 	same)	cp ${DATA} ${COPY}.2
 		;;
-	1m)	dd if=${COPY}.1 of=${COPY}.2 bs=1k count=1k >/dev/null 2<&1
-		;;
 	*)	dd if=${COPY}.1 of=${COPY}.2 bs=${size} count=1 >/dev/null 2>&1
 		;;
 	esac

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list