svn commit: trunk/busybox/miscutils

[aldot at busybox.net]

Author: aldot
Date: 2006-02-27 14:34:41 -0800 (Mon, 27 Feb 2006)
New Revision: 14314

Log:
- whitespace cleanup from Tito.


Modified:
   trunk/busybox/miscutils/strings.c


Changeset:
Modified: trunk/busybox/miscutils/strings.c
===================================================================
--- trunk/busybox/miscutils/strings.c	2006-02-27 15:09:48 UTC (rev 14313)
+++ trunk/busybox/miscutils/strings.c	2006-02-27 22:34:41 UTC (rev 14314)
@@ -5,20 +5,8 @@
  * Copyright (c) 1980, 1987
  *	The Regents of the University of California.  All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
  * Original copyright notice is retained at the end of this file.
  *
  * Modified for BusyBox by Erik Andersen <andersen at codepoet.org>
@@ -31,8 +19,6 @@
 #include <ctype.h>
 #include "busybox.h"
 
-#define ISSTR(ch)	(isprint(ch) || ch == '\t')
-
 #define WHOLE_FILE		1
 #define PRINT_NAME		2
 #define PRINT_OFFSET	4
@@ -48,7 +34,7 @@
 	const char *fmt = "%s: ";
 	char *n_arg = "4";
 
-	opt = bb_getopt_ulflags (argc, argv, "afon:", &n_arg);
+	opt = bb_getopt_ulflags(argc, argv, "afon:", &n_arg);
 	/* -a is our default behaviour */
 
 	argc -= optind;
@@ -58,7 +44,7 @@
 	string = xcalloc(n + 1, 1);
 	n--;
 
-	if ( argc == 0) {
+	if (argc == 0) {
 		fmt = "{%s}: ";
 		*argv = (char *)bb_msg_standard_input;
 		goto PIPE;
@@ -70,9 +56,9 @@
 			count = 0;
 			do {
 				c = fgetc(file);
-				if (ISSTR(c)) {
+				if (isprint(c) || c == '\t') {
 					if (i <= n) {
-						string[i]=c;
+						string[i] = c;
 					} else {
 						putchar(c);
 					}
@@ -81,7 +67,7 @@
 							printf(fmt, *argv);
 						}
 						if (opt & PRINT_OFFSET) {
-							printf("%7lo ", count - n );
+							printf("%7lo ", count - n);
 						}
 						printf("%s", string);
 					}
@@ -96,11 +82,12 @@
 			} while (c != EOF);
 			bb_fclose_nonstdin(file);
 		} else {
-			status=EXIT_FAILURE;
+			status = EXIT_FAILURE;
 		}
-	} while ( --argc > 0 );
+	} while (--argc > 0);
 
-	if (ENABLE_FEATURE_CLEAN_UP) free(string);
+	if (ENABLE_FEATURE_CLEAN_UP)
+		free(string);
 
 	bb_fflush_stdout_and_exit(status);
 }