diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-08-29 15:46:01 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-08-29 15:46:01 +0000 |
| commit | 2e97a36905ba9936cb9972e37c5e56deb288e442 (patch) | |
| tree | 63724b2d8e911727737ec31273789b3f46ffa6ff /sftp.c | |
| parent | 4bc11fc94e472842a59429d633d4b97124da2a2e (diff) | |
| download | src-test2-2e97a36905ba9936cb9972e37c5e56deb288e442.tar.gz src-test2-2e97a36905ba9936cb9972e37c5e56deb288e442.zip | |
Notes
Diffstat (limited to 'sftp.c')
| -rw-r--r-- | sftp.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.132 2010/12/04 00:18:01 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.134 2011/11/16 12:24:28 oga Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -793,7 +793,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); @@ -1630,8 +1631,10 @@ complete_cmd_parse(EditLine *el, char *cmd, int lastarg, char quote, } list[count] = NULL; - if (count == 0) + if (count == 0) { + xfree(list); return 0; + } /* Complete ambigious command */ tmp = complete_ambiguous(cmd, list, count); |