svn commit: r242840 - head/bin/ls

[Peter Wemm]

Author: peter
Date: Fri Nov  9 20:19:56 2012
New Revision: 242840
URL: http://svnweb.freebsd.org/changeset/base/242840

Log:
  Undo over-aggressive conversion of spaces to tabs. ie: those within
  format strings, "period, space, space" in comment text, etc.

Modified:
  head/bin/ls/ls.c
  head/bin/ls/print.c

Modified: head/bin/ls/ls.c
==============================================================================
--- head/bin/ls/ls.c	Fri Nov  9 19:45:17 2012	(r242839)
+++ head/bin/ls/ls.c	Fri Nov  9 20:19:56 2012	(r242840)
@@ -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 opt
 
 			/*
 			 * 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

Modified: head/bin/ls/print.c
==============================================================================
--- head/bin/ls/print.c	Fri Nov  9 19:45:17 2012	(r242839)
+++ head/bin/ls/print.c	Fri Nov  9 20:19:56 2012	(r242840)
@@ -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);