From 69271875a96884044c0f8a2c5731cf7af361428f Mon Sep 17 00:00:00 2001 From: interp Date: Fri, 7 Sep 2001 15:22:02 +0000 Subject: [PATCH] COLUMNS - flag works now (removed bug from previous revision). --- ls.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ls.scm b/ls.scm index a11befb..376f3d0 100644 --- a/ls.scm +++ b/ls.scm @@ -78,11 +78,12 @@ (if recursive? (let ((directories - (map (lambda (file-name) - (string-append directory file-name)) +; (map (lambda (file-name) +; (string-append directory file-name)) (filter (lambda (file) (file-directory? file #f)) - files)))) + files))) +; ) (if (not (null? directories)) (begin (newline port) @@ -128,7 +129,8 @@ ((= column columns)) (let ((tail (vector-ref tails column))) (if (not (null? tail)) - (let ((width (display-file (car tail) flag? port))) + (let* ((file-name (car tail)) + (width (display-file file-name (file-info file-name) flag? port))) (display-spaces (- column-width width) port) (vector-set! tails column (cdr tail)))))) (newline port))))