summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2010-06-18 00:58:40 +0000
committerDamien Miller <djm@cvs.openbsd.org>2010-06-18 00:58:40 +0000
commit73ce923e90d0ee88e72062211788af6acda6b4ee (patch)
tree389dfb28e6b7528af9e7f4232a125b0b36c75060
parentb2e3c8e53d83970074fb38fedf7b97d1fad90a5f (diff)
unbreak ls in working directories that contains globbing characters in
their pathnames. bz#1655 reported by vgiffin AT apple.com
-rw-r--r--usr.bin/ssh/sftp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c
index bb21e275693..c04c9e525e6 100644
--- a/usr.bin/ssh/sftp.c
+++ b/usr.bin/ssh/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.124 2010/05/05 04:22:09 dtucker Exp $ */
+/* $OpenBSD: sftp.c,v 1.125 2010/06/18 00:58:39 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -1345,7 +1345,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
break;
case I_LS:
if (!path1) {
- do_globbed_ls(conn, *pwd, *pwd, lflag);
+ do_ls_dir(conn, *pwd, *pwd, lflag);
break;
}