X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=wc.c;h=695e7e7d4e4b765b1954d5ecb5d9ea11f1128a10;hb=3a6da8c183142a2681a2382b63e970f457cf807b;hp=02e2b2aa661b99b81f4ca33fab0d61b49ffe2939;hpb=3950596e1e13d3593d06ab3cf1e48a07d5bd80c9;p=oweals%2Fbusybox.git

diff --git a/wc.c b/wc.c
index 02e2b2aa6..695e7e7d4 100644
--- a/wc.c
+++ b/wc.c
@@ -2,7 +2,7 @@
 /*
  * 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
@@ -20,15 +20,17 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #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 = "";
 
@@ -105,7 +107,7 @@ int wc_main(int argc, char **argv)
 {
 	FILE *file;
 	unsigned int num_files_counted = 0;
-	int opt;
+	int opt, status = EXIT_SUCCESS;
 
 	total_lines = total_words = total_chars = max_length = 0;
 	print_lines = print_words = print_chars = print_length = 0;
@@ -125,7 +127,7 @@ int wc_main(int argc, char **argv)
 				print_words = 1;
 				break;
 			default:
-				usage(wc_usage);
+				show_usage();
 			}
 	}
 
@@ -134,14 +136,13 @@ int wc_main(int argc, char **argv)
 
 	if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) {
 		wc_file(stdin, "");
-		exit(TRUE);
+		return EXIT_SUCCESS;
 	} else {
 		while (optind < argc) {
-			file = fopen(argv[optind], "r");
-			if (file == NULL) {
-				fatalError(argv[optind]);
-			}
-			wc_file(file, argv[optind]);
+			if ((file = wfopen(argv[optind], "r")) != NULL)
+				wc_file(file, argv[optind]);
+			else
+				status = EXIT_FAILURE;
 			num_files_counted++;
 			optind++;
 		}
@@ -151,5 +152,5 @@ int wc_main(int argc, char **argv)
 		print_counts(total_lines, total_words, total_chars,
 					 max_length, "total");
 
-	return 0 ;
+	return status;
 }