2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 61b714348..8cf7e5eba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
      [cipher.c]
      enable acss for ssh
      ok deraadt@ markus@
+   - mouring@cvs.openbsd.org 2004/01/23 17:57:48
+     [sftp-int.c]
+     Fix issue pointed out with ls not handling large directories 
+     with embeded paths correctly.  OK damien@
  - (djm) [acss.c acss.h cipher-acss.c] Portable support for ACSS 
    if libcrypto lacks it
 
@@ -1746,4 +1750,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3193 2004/01/27 10:19:21 djm Exp $
+$Id: ChangeLog,v 1.3194 2004/01/27 10:20:11 djm Exp $
diff --git a/sftp-int.c b/sftp-int.c
index a9423fe69..3ee57515d 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -25,7 +25,7 @@
 /* XXX: recursive operations */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-int.c,v 1.66 2004/01/13 09:25:05 djm Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.67 2004/01/23 17:57:48 mouring Exp $");
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -595,17 +595,24 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag)
         if (!(lflag & SHORT_VIEW)) {
                 int m = 0, width = 80;
                 struct winsize ws;
+                char *tmp;
 
                 /* Count entries for sort and find longest filename */
                 for (n = 0; d[n] != NULL; n++)
                         m = MAX(m, strlen(d[n]->filename));
 
+                /* Add any subpath that also needs to be counted */
+                tmp = path_strip(path, strip_path);
+                m += strlen(tmp);
+                xfree(tmp);
+
                 if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) != -1)
                         width = ws.ws_col;
 
                 columns = width / (m + 2);
                 columns = MAX(columns, 1);
                 colspace = width / columns;
+                colspace = MIN(colspace, width);
         }
 
         qsort(d, n, sizeof(*d), sdirent_comp);