diff options
| author | peter <peter@FreeBSD.org> | 2012-11-09 20:19:56 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2012-11-09 20:19:56 +0000 |
| commit | 0a19b1f1d4c316b4e1f36b1a3d99c8d8d3d4db97 (patch) | |
| tree | ff71cef9a970b055c77d5b5d53e3d839a262c197 /bin | |
| parent | b71b1dcf10941dcc438f95f3cd8e2e7f6acd5fb0 (diff) | |
| download | FreeBSD-src-0a19b1f1d4c316b4e1f36b1a3d99c8d8d3d4db97.zip FreeBSD-src-0a19b1f1d4c316b4e1f36b1a3d99c8d8d3d4db97.tar.gz | |
Undo over-aggressive conversion of spaces to tabs. ie: those within
format strings, "period, space, space" in comment text, etc.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ls/ls.c | 8 | ||||
| -rw-r--r-- | bin/ls/print.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 8d0455e..be09035 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #define STRBUF_SIZEOF(t) (1 + CHAR_BIT * sizeof(t) / 3 + 1) /* - * MAKENINES(n) turns n into (10**n)-1. This is useful for converting a width + * MAKENINES(n) turns n into (10**n)-1. This is useful for converting a width * into a number that wide in decimal. * XXX: Overflows are not considered. */ @@ -241,7 +241,7 @@ main(int argc, char *argv[]) f_timesort = 1; f_sizesort = 0; break; - /* Other flags. Please keep alphabetic. */ + /* Other flags. Please keep alphabetic. */ case ',': f_thousands = 1; break; @@ -534,7 +534,7 @@ traverse(int argc, char *argv[], int options) /* * If already output something, put out a newline as - * a separator. If multiple arguments, precede each + * a separator. If multiple arguments, precede each * directory with its name. */ if (output) { @@ -874,7 +874,7 @@ label_out: /* * Ordering for mastercmp: * If ordering the argv (fts_level = FTS_ROOTLEVEL) return non-directories - * as larger than directories. Within either group, use the sort function. + * as larger than directories. Within either group, use the sort function. * All other levels use the sort function. Error entries remain unsorted. */ static int diff --git a/bin/ls/print.c b/bin/ls/print.c index 89faf6c..930d6ea 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -160,7 +160,7 @@ printlong(const DISPLAY *dp) strmode(sp->st_mode, buf); aclmode(buf, p); np = p->fts_pointer; - (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, + (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group); if (f_flags) @@ -382,7 +382,7 @@ printtime(time_t ftime) format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y" : "%b %e %Y"; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); fputc(' ', stdout); |
