- dtucker@cvs.openbsd.org 2005/10/31 06:15:04

     [sftp.c]
     Fix sorting with "ls -1" command. From Robert Tsai, "looks right" deraadt@

1 files changed, 3 insertions, 1 deletions

diff --git a/sftp.c b/sftp.c
index f29927c0f..ff3223ad2 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);
         }