summaryrefslogtreecommitdiff
path: root/sftp.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-11-05 15:15:23 +1100
committerDamien Miller <djm@mindrot.org>2005-11-05 15:15:23 +1100
commit653b93be5d67a918419e63db34383aa3a552db12 (patch)
treec5951b1803f93558752e5ccaf42cc21e36cd6fc2 /sftp.c
parent788f212aed68781efe7aa80e625c5f8cd4d98100 (diff)
downloadopenssh-git-653b93be5d67a918419e63db34383aa3a552db12.tar.gz
- dtucker@cvs.openbsd.org 2005/10/31 06:15:04
[sftp.c] Fix sorting with "ls -1" command. From Robert Tsai, "looks right" deraadt@
Diffstat (limited to 'sftp.c')
-rw-r--r--sftp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sftp.c b/sftp.c
index f29927c0..ff3223ad 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
#include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.67 2005/09/13 23:40:07 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.68 2005/10/31 06:15:04 dtucker Exp $");
#ifdef USE_LIBEDIT
#include <histedit.h>
@@ -697,6 +697,8 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag)
}
if (lflag & SORT_FLAGS) {
+ for (n = 0; d[n] != NULL; n++)
+ ; /* count entries */
sort_flag = lflag & (SORT_FLAGS|LS_REVERSE_SORT);
qsort(d, n, sizeof(*d), sdirent_comp);
}