d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo over-aggressive conversion of spaces to tabs. ie: those within

Browse Source 
format strings, "period, space, space" in comment text, etc.
This commit is contained in:
Peter Wemm 2012-11-09 20:19:56 +00:00
parent 39d9149396
commit d272a5b786
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=242840
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/ls/ls.c
View File

@ -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 @@ display(const FTSENT *p, FTSENT *list, int options)
/*
* 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

4
bin/ls/print.c
View File

@ -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);