Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-18 07:31:34 +00:00
Code Issues Projects Releases Wiki Activity

Minor space saving improvments

Browse Source
This commit is contained in:
Glenn L McGrath 2001-11-21 12:46:36 +00:00
parent 74afa9aed1
commit 9e6c9f7311
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
coreutils/wc.c
View File

@ -26,9 +26,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "busybox.h" #include "busybox.h"
static int total_lines, total_words, total_chars, max_length;
//static int print_lines, print_words, print_chars, print_length;
static char print_type = 0;
enum print_e { enum print_e {
print_lines = 1, print_lines = 1,
print_words = 2, print_words = 2,
@ -36,8 +33,14 @@ enum print_e {
print_length = 8 print_length = 8
}; };
static void print_counts(int lines, int words, int chars, int length, static unsigned int total_lines = 0;
const char *name) static unsigned int total_words = 0;
static unsigned int total_chars = 0;
static unsigned int max_length = 0;
static char print_type = 0;
static void print_counts(const unsigned int lines, const unsigned int words,
const unsigned int chars, const unsigned int length, const char *name)
{ {
if (print_type & print_lines) { if (print_type & print_lines) {
printf("%7d ", lines); printf("%7d ", lines);
@ -59,11 +62,14 @@ static void print_counts(int lines, int words, int chars, int length,
static void wc_file(FILE * file, const char *name) static void wc_file(FILE * file, const char *name)
{ {
int lines, words, chars, length; unsigned int lines = 0;
int in_word = 0, linepos = 0; unsigned int words = 0;
int c; unsigned int chars = 0;
unsigned int length = 0;
unsigned int linepos = 0;
char in_word = 0;
char c;
lines = words = chars = length = 0;
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
chars++; chars++;
switch (c) { switch (c) {
@ -81,7 +87,7 @@ static void wc_file(FILE * file, const char *name)
case ' ': case ' ':
linepos++; linepos++;
case '\v': case '\v':
word_separator: word_separator:
if (in_word) { if (in_word) {
in_word = 0; in_word = 0;
words++; words++;
@ -93,30 +99,27 @@ static void wc_file(FILE * file, const char *name)
break; break;
} }
} }
if (linepos > length) if (linepos > length) {
length = linepos; length = linepos;
if (in_word) }
if (in_word) {
words++; words++;
}
print_counts(lines, words, chars, length, name); print_counts(lines, words, chars, length, name);
total_lines += lines; total_lines += lines;
total_words += words; total_words += words;
total_chars += chars; total_chars += chars;
if (length > max_length) if (length > max_length) {
max_length = length; max_length = length;
fclose(file); }
fflush(stdout);
} }
int wc_main(int argc, char **argv) int wc_main(int argc, char **argv)
{ {
FILE *file; int opt;
unsigned int num_files_counted = 0;
int opt, status = EXIT_SUCCESS;
total_lines = total_words = total_chars = max_length = 0;
while ((opt = getopt(argc, argv, "clLw")) > 0) { while ((opt = getopt(argc, argv, "clLw")) > 0) {
switch (opt) { switch (opt) {
case 'c': case 'c':
print_type |= print_chars; print_type |= print_chars;
break; break;
@ -131,7 +134,7 @@ int wc_main(int argc, char **argv)
break; break;
default: default:
show_usage(); show_usage();
} }
} }
if (print_type == 0) { if (print_type == 0) {
@ -140,8 +143,8 @@ int wc_main(int argc, char **argv)
if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) { if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) {
wc_file(stdin, ""); wc_file(stdin, "");
return EXIT_SUCCESS;
} else { } else {
unsigned short num_files_counted = 0;
while (optind < argc) { while (optind < argc) {
if (print_type == print_chars) { if (print_type == print_chars) {
struct stat statbuf; struct stat statbuf;
@ -149,17 +152,18 @@ int wc_main(int argc, char **argv)
print_counts(0, 0, statbuf.st_size, 0, argv[optind]); print_counts(0, 0, statbuf.st_size, 0, argv[optind]);
total_chars += statbuf.st_size; total_chars += statbuf.st_size;
} else { } else {
FILE *file;
file = xfopen(argv[optind], "r"); file = xfopen(argv[optind], "r");
wc_file(file, argv[optind]); wc_file(file, argv[optind]);
fclose(file);
} }
num_files_counted++;
optind++; optind++;
num_files_counted++;
}
if (num_files_counted > 1) {
print_counts(total_lines, total_words, total_chars, max_length, "total");
} }
} }
if (num_files_counted > 1) return(EXIT_SUCCESS);
print_counts(total_lines, total_words, total_chars,
max_length, "total");
return status;
} }