diff options
| author | Tim J. Robbins <tjr@FreeBSD.org> | 2002-11-17 10:27:34 +0000 |
|---|---|---|
| committer | Tim J. Robbins <tjr@FreeBSD.org> | 2002-11-17 10:27:34 +0000 |
| commit | 10dd27a4d7088f79ef8954da3a2d7ee9a401f7a1 (patch) | |
| tree | 062c1e84891187ac3fce4a3e696bc192ca77ae71 /bin | |
| parent | f47af85b22aa8a7cb0b600ebfea87313f3c6f368 (diff) | |
Notes
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ls/extern.h | 1 | ||||
| -rw-r--r-- | bin/ls/ls.c | 11 | ||||
| -rw-r--r-- | bin/ls/print.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/bin/ls/extern.h b/bin/ls/extern.h index d6b420875c3f..7f480aac04f2 100644 --- a/bin/ls/extern.h +++ b/bin/ls/extern.h @@ -45,6 +45,7 @@ int revstatcmp(const FTSENT *, const FTSENT *); void printcol(DISPLAY *); void printlong(DISPLAY *); +int printname(const char *); void printscol(DISPLAY *); void printstream(DISPLAY *); void usage(void); diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 55f8676557c2..7beb05aada4f 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -465,10 +465,13 @@ traverse(int argc, char *argv[], int options) * a separator. If multiple arguments, precede each * directory with its name. */ - if (output) - (void)printf("\n%s:\n", p->fts_path); - else if (argc > 1) { - (void)printf("%s:\n", p->fts_path); + if (output) { + putchar('\n'); + printname(p->fts_path); + puts(":"); + } else if (argc > 1) { + printname(p->fts_path); + puts(":"); output = 1; } chp = fts_children(ftsp, ch_options); diff --git a/bin/ls/print.c b/bin/ls/print.c index 53881d6281ca..8fbcd21f0643 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -141,7 +141,7 @@ printscol(DISPLAY *dp) /* * print name in current style */ -static int +int printname(const char *name) { if (f_octal || f_octal_escape) |