diff options
| author | Erik Andersen <andersen@codepoet.org> | 2000-02-11 21:55:04 +0000 |
|---|---|---|
| committer | Erik Andersen <andersen@codepoet.org> | 2000-02-11 21:55:04 +0000 |
| commit | 9ffdaa647ee57263247e047e6c67c5a7fa1f2a6c (patch) | |
| tree | 3485e1645439990642fcb941d579deb10f8a17a7 /coreutils/ls.c | |
| parent | 5e1b2ca1161cba481ccf4873427389f59dbc23e0 (diff) | |
| download | busybox-9ffdaa647ee57263247e047e6c67c5a7fa1f2a6c.tar.gz | |
Updates
-Erik
Diffstat (limited to 'coreutils/ls.c')
| -rw-r--r-- | coreutils/ls.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index f23c1e086..c2266f533 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -29,10 +29,10 @@ * it more portable. * * KNOWN BUGS: - * 1. messy output if you mix files and directories on the command line - * 2. ls -l of a directory doesn't give "total <blocks>" header - * 3. ls of a symlink to a directory doesn't list directory contents - * 4. hidden files can make column width too large + * 1. ls -l of a directory doesn't give "total <blocks>" header + * 2. ls of a symlink to a directory doesn't list directory contents + * 3. hidden files can make column width too large + * * NON-OPTIMAL BEHAVIOUR: * 1. autowidth reads directories twice * 2. if you do a short directory listing without filetype characters @@ -100,7 +100,9 @@ static unsigned short opts = 0; static unsigned short column = 0; #ifdef BB_FEATURE_AUTOWIDTH -static unsigned short terminal_width = 0, column_width = 0; +static unsigned short terminal_width = 0; +static unsigned short column_width = 0; +static unsigned short toplevel_column_width = 0; #else #define terminal_width TERMINAL_WIDTH #define column_width COLUMN_WIDTH @@ -349,6 +351,9 @@ static int list_item(const char *name) goto listerr; if (!S_ISDIR(info.st_mode) || (opts & DIR_NOLIST)) { +#ifdef BB_FEATURE_AUTOWIDTH + column_width = toplevel_column_width; +#endif list_single(name, &info, name); return 0; } @@ -407,6 +412,15 @@ static int list_item(const char *name) list_single(entry->d_name, &info, fullname); } closedir(dir); + + if (opts & DISP_DIRNAME) { /* separate the directory */ + if (column) { + wr("\n", 1); + } + wr("\n", 1); + column = 0; + } + return 0; direrr: @@ -530,8 +544,8 @@ extern int ls_main(int argc, char **argv) for (i = argi; i < argc; i++) { int len = strlen(argv[i]); - if (column_width < len) - column_width = len; + if (toplevel_column_width < len) + toplevel_column_width = len; } #endif |