X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fstrings.c;h=111aa94ba0f0bc4675d4bea162edf0fead205bba;hb=843c5ef0f95e0a6f61f4e27d0355aca5e09ee6b1;hp=9d8012aa22f4b76d21d8ad8644419c45d63b923d;hpb=65ddf77fbd0f1ec832f062cf05a15bbd2cf1080e;p=oweals%2Fbusybox.git

diff --git a/miscutils/strings.c b/miscutils/strings.c
index 9d8012aa2..111aa94ba 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -21,107 +21,88 @@
  *
  * Original copyright notice is retained at the end of this file.
  *
- * Modified for BusyBox by Erik Andersen <andersee@debian.org>
+ * Modified for BusyBox by Erik Andersen <andersen@codepoet.org>
  * Badly hacked by Tito Ragusa <farmatito@tiscali.it>
  */
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <getopt.h>
-#include <unistd.h>
 #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
+#define SIZE			8
+
 int strings_main(int argc, char **argv)
 {
-	extern char *optarg;
-	extern int optind;
-	int n=4, c, i, opt=0, a=0;
-	long    t, count;
-	FILE *file;
+	int n, c, i = 0, status = EXIT_SUCCESS;
+	unsigned long opt;
+	unsigned long count;
+	FILE *file = stdin;
 	char *string;
+	const char *fmt = "%s: ";
+	char *n_arg = "4";
+	
+	opt = bb_getopt_ulflags (argc, argv, "afon:", &n_arg);
+	/* -a is our default behaviour */
 	
-	while ((i = getopt(argc, argv, "an:of")) > 0)
-		switch(i)
-		{
-			case 'a':
-				break;
-			case 'f':
-				opt++;
-				break;
-			case 'n':
-				n = atoi(optarg);
-				if(!(n/1))
-					show_usage();
-				break;
-			case 'o':
-				opt++;
-				opt++;
-				break;
-			default:
-				show_usage();
-		}
-
 	argc -= optind;
 	argv += optind;
 
-	i=0;
-
-	if(!argc )
-	{
-		file = stdin;
-		goto pipe;
+	n = bb_xgetlarg(n_arg, 10, 1, INT_MAX);
+	string = xcalloc(n + 1, 1);
+	n--;
+	
+	if ( argc == 0) {
+		fmt = "{%s}: ";
+		*argv = (char *)bb_msg_standard_input;
+		goto PIPE;
 	}
-
-	for(a=0;a<argc;a++)
-	{
-		file=xfopen(argv[a],"r");
-
-		pipe:
-		
-		count=0;
-		string=xmalloc(n);
-		string[n]='\0';
-		n--;
-		while(1)
-		{
-			c=fgetc(file);
-			if(ISSTR(c))
-			{
-				if(i==0)
-					t=count;
-				if(i<=n)
-					string[i]=c;
-				if(i==n)
-				{
-					if(opt == 1 || opt == 3 )
-						printf("%s: ",(!argv[a])?"{stdin}":argv[a]);
-					if(opt >= 2 )
-						printf("%7lo ",t);
-					printf("%s",string);
+	
+	do {
+		if ((file = bb_wfopen(*argv, "r"))) {
+PIPE:
+			count = 0;
+			do {
+				c = fgetc(file);
+				if (ISSTR(c)) {
+					if (i <= n) {
+						string[i]=c;
+					} else {
+						putchar(c);
+					}
+					if (i == n) {
+						if (opt & PRINT_NAME) {
+							printf(fmt, *argv);
+						}
+						if (opt & PRINT_OFFSET) {
+							printf("%7lo ", count - n );
+						}
+						printf("%s", string);
+					}
+					i++;
+				} else {
+					if (i > n) {
+						putchar('\n');
+					}
+					i = 0;
 				}
-				if(i>n)
-					putchar(c);
-				i++;
-			}
-			else
-			{
-				if(i>n)
-					puts("");
-				i=0;
-			}
-			count++;
-			if(c==EOF)
-				break;
+				count++;
+			} while (c != EOF);
+			bb_fclose_nonstdin(file);
+		} else {
+			status=EXIT_FAILURE;
 		}
-		if(file!=stdin)
-			fclose(file);
-	}
-	free(string);
-	exit(EXIT_SUCCESS);
+	} while ( --argc > 0 );
+
+	if (ENABLE_FEATURE_CLEAN_UP) free(string);
+
+	bb_fflush_stdout_and_exit(status);
 }
 
 /*
@@ -138,7 +119,7 @@ int strings_main(int argc, char **argv)
  *    documentation and/or other materials provided with the distribution.
  *
  * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- *		ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> 
+ *		ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
  *
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software