X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fwc.c;h=695e7e7d4e4b765b1954d5ecb5d9ea11f1128a10;hb=a6ce670a87ee77ccb9337ed6d87442134e1a48ed;hp=a1e2fca56b9943aff2e66c3dd50292863d17f046;hpb=3163821967821518cfa4c4315f775ec5301bb023;p=oweals%2Fbusybox.git

diff --git a/coreutils/wc.c b/coreutils/wc.c
index a1e2fca56..695e7e7d4 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -1,7 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini wc implementation for busybox
  *
- * by Edward Betts <edward@debian.org>
+ * Copyright (C) 2000  Edward Betts <edward@debian.org>
  *
  * 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
@@ -19,83 +20,80 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
-
-static const char wc_usage[] = "wc [OPTION]... [FILE]...\n\n"
-"Print line, word, and byte counts for each FILE, and a total line if\n"
-"more than one FILE is specified.  With no FILE, read standard input.\n"
-"\t-c\tprint the byte counts\n"
-"\t-l\tprint the newline counts\n"
-"\t-L\tprint the length of the longest line\n"
-"\t-L\tprint the length of the longest line\n"
-"\t-w\tprint the word counts\n";
+#include <getopt.h>
+#include <string.h>
+#include <stdlib.h>
+#include "busybox.h"
 
 static int total_lines, total_words, total_chars, max_length;
 static int print_lines, print_words, print_chars, print_length;
 
-void print_counts (int lines, int words, int chars, int length, 
-		const char *name) {
+static void print_counts(int lines, int words, int chars, int length,
+				  		 const char *name)
+{
 	char const *space = "";
+
 	if (print_lines) {
-		printf ("%7d", lines);
+		printf("%7d", lines);
 		space = " ";
 	}
 	if (print_words) {
-		printf ("%s%7d", space, words);
+		printf("%s%7d", space, words);
 		space = " ";
 	}
 	if (print_chars) {
-		printf ("%s%7d", space, chars);
+		printf("%s%7d", space, chars);
 		space = " ";
 	}
 	if (print_length)
-		printf ("%s%7d", space, length);
+		printf("%s%7d", space, length);
 	if (*name)
-		printf (" %s", name);
-	putchar ('\n');
+		printf(" %s", name);
+	putchar('\n');
 }
 
-static void wc_file(FILE *file, const char *name) 
+static void wc_file(FILE * file, const char *name)
 {
 	int lines, words, chars, length;
 	int in_word = 0, linepos = 0;
 	int c;
+
 	lines = words = chars = length = 0;
 	while ((c = getc(file)) != EOF) {
 		chars++;
 		switch (c) {
-			case '\n': 
-				lines++;
-			case '\r':
-			case '\f': 
-				if (linepos > length)
-					length = linepos;
-				linepos = 0;
-				goto word_separator;
-			case '\t':
-				linepos += 8 - (linepos % 8);
-				goto word_separator;
-			case ' ':
-				linepos++;
-			case '\v':
-			word_separator:
-				if (in_word) {
-					in_word = 0;
-					words++;
-				}
-				break;
-			default:
-				linepos++;
-				in_word = 1;
-				break;
+		case '\n':
+			lines++;
+		case '\r':
+		case '\f':
+			if (linepos > length)
+				length = linepos;
+			linepos = 0;
+			goto word_separator;
+		case '\t':
+			linepos += 8 - (linepos % 8);
+			goto word_separator;
+		case ' ':
+			linepos++;
+		case '\v':
+		  word_separator:
+			if (in_word) {
+				in_word = 0;
+				words++;
+			}
+			break;
+		default:
+			linepos++;
+			in_word = 1;
+			break;
 		}
 	}
 	if (linepos > length)
 		length = linepos;
 	if (in_word)
 		words++;
-	print_counts (lines, words, chars, length, name);
+	print_counts(lines, words, chars, length, name);
 	total_lines += lines;
 	total_words += words;
 	total_chars += chars;
@@ -105,58 +103,54 @@ static void wc_file(FILE *file, const char *name)
 	fflush(stdout);
 }
 
-int wc_main(int argc, char **argv) {
+int wc_main(int argc, char **argv)
+{
 	FILE *file;
+	unsigned int num_files_counted = 0;
+	int opt, status = EXIT_SUCCESS;
+
 	total_lines = total_words = total_chars = max_length = 0;
 	print_lines = print_words = print_chars = print_length = 0;
 
-	while (--argc && **(++argv) == '-') {
-		while (*++(*argv))
-			switch (**argv) {
-				case 'c':
-					print_chars = 1;
-					break;
-				case 'l':
-					print_lines = 1;
-					break;
-				case 'L':
-					print_length = 1;
-					break;
-				case 'w':
-					print_words = 1;
-					break;
-				default:
-					usage (wc_usage);
+	while ((opt = getopt(argc, argv, "clLw")) > 0) {
+			switch (opt) {
+			case 'c':
+				print_chars = 1;
+				break;
+			case 'l':
+				print_lines = 1;
+				break;
+			case 'L':
+				print_length = 1;
+				break;
+			case 'w':
+				print_words = 1;
+				break;
+			default:
+				show_usage();
 			}
 	}
 
 	if (!print_lines && !print_words && !print_chars && !print_length)
 		print_lines = print_words = print_chars = 1;
 
-	if (argc == 0) {
+	if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) {
 		wc_file(stdin, "");
-		exit(TRUE);
-	}
-	else if (argc == 1) {
-		file = fopen(*argv, "r");
-		if (file == NULL) {
-			perror(*argv);
-			exit(FALSE);
+		return EXIT_SUCCESS;
+	} else {
+		while (optind < argc) {
+			if ((file = wfopen(argv[optind], "r")) != NULL)
+				wc_file(file, argv[optind]);
+			else
+				status = EXIT_FAILURE;
+			num_files_counted++;
+			optind++;
 		}
-		wc_file(file, *argv);
 	}
-	else {
-		while (argc-- > 0 && *argv != '\0' && strlen(*argv)) {
-			file = fopen(*argv, "r");
-			if (file == NULL) {
-				perror(*argv);
-				exit(FALSE);
-			}
-			wc_file(file, *argv);
-			argv++;
-		}
-		print_counts (total_lines, total_words, total_chars, 
-				max_length, "total");
-	}
-	exit(TRUE);
+
+	if (num_files_counted > 1)
+		print_counts(total_lines, total_words, total_chars,
+					 max_length, "total");
+
+	return status;
 }