diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2011-09-22 06:29:04 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2011-09-22 06:29:04 +0000 |
| commit | e216dbd49ce115bf65ed792908e657ddcc7fc7e9 (patch) | |
| tree | 719ad21d2e6a3cd723d4b8faa76d34634af973e1 /usr.bin/ssh/sftp.c | |
| parent | 2e36485a3a2199e923ce56f1ca9344cbd80ce691 (diff) | |
don't let remote_glob() implicitly sort its results in do_globbed_ls() -
in all likelihood, they will be resorted anyway
Diffstat (limited to 'usr.bin/ssh/sftp.c')
| -rw-r--r-- | usr.bin/ssh/sftp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c index 0a5c6b52402..dfa5f4b3c33 100644 --- a/usr.bin/ssh/sftp.c +++ b/usr.bin/ssh/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.132 2010/12/04 00:18:01 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.133 2011/09/22 06:29:03 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -770,7 +770,8 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, memset(&g, 0, sizeof(g)); if (remote_glob(conn, path, - GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE|GLOB_KEEPSTAT, NULL, &g) || + GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE|GLOB_KEEPSTAT|GLOB_NOSORT, + NULL, &g) || (g.gl_pathc && !g.gl_matchc)) { if (g.gl_pathc) globfree(&g); |