tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (tim) [regress/sftp-glob.sh] Shell portability fix.

This commit is contained in:
Tim Rice 2008-03-07 19:00:33 -08:00
parent a79bb8ec5e
commit 68d293859e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -37,6 +37,7 @@
- deraadt@cvs.openbsd.org 2008/03/04 21:15:42
[version.h]
crank version; from djm
- (tim) [regress/sftp-glob.sh] Shell portability fix.
20080302
- (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect
@ -3697,4 +3698,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4859 2008/03/07 07:35:47 djm Exp $
$Id: ChangeLog,v 1.4860 2008/03/08 03:00:33 tim Exp $

7
regress/sftp-glob.sh
View File

@ -15,10 +15,13 @@ sftp_ls() {
if [ $? -ne 0 ]; then
fail "$errtag failed"
fi
if test "x$expected" != "x" && \
! fgrep "$expected" ${RESULTS} >/dev/null 2>&1 ; then
if test "x$expected" != "x" ; then
if fgrep "$expected" ${RESULTS} >/dev/null 2>&1 ; then
:
else
fail "$expected missing from $errtag results"
fi
fi
if test "x$unexpected" != "x" && \
fgrep "$unexpected" ${RESULTS} >/dev/null 2>&1 ; then
fail "$unexpected present in $errtag results"