diff options
author | Damien Miller <djm@mindrot.org> | 2011-09-22 21:43:06 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-09-22 21:43:06 +1000 |
commit | d7be70d0524abbc37861af61a75f576d7f82d93b (patch) | |
tree | f70fa223519b569f0ecc9ff16c7fc175cedeca99 /sftp.c | |
parent | 57c38ac7d5e81c9fa6643ec8a3ed08c0c96bde64 (diff) |
- djm@cvs.openbsd.org 2011/09/22 06:29:03
[sftp.c]
don't let remote_glob() implicitly sort its results in do_globbed_ls() -
in all likelihood, they will be resorted anyway
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.132 2010/12/04 00:18:01 djm Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.133 2011/09/22 06:29:03 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -793,7 +793,8 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, | |||
793 | memset(&g, 0, sizeof(g)); | 793 | memset(&g, 0, sizeof(g)); |
794 | 794 | ||
795 | if (remote_glob(conn, path, | 795 | if (remote_glob(conn, path, |
796 | GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE|GLOB_KEEPSTAT, NULL, &g) || | 796 | GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE|GLOB_KEEPSTAT|GLOB_NOSORT, |
797 | NULL, &g) || | ||
797 | (g.gl_pathc && !g.gl_matchc)) { | 798 | (g.gl_pathc && !g.gl_matchc)) { |
798 | if (g.gl_pathc) | 799 | if (g.gl_pathc) |
799 | globfree(&g); | 800 | globfree(&g); |