diff options
Diffstat (limited to 'cat.c')
-rw-r--r-- | cat.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -24,7 +24,6 @@ | |||
24 | #include "internal.h" | 24 | #include "internal.h" |
25 | #include <stdio.h> | 25 | #include <stdio.h> |
26 | 26 | ||
27 | |||
28 | static void print_file(FILE * file) | 27 | static void print_file(FILE * file) |
29 | { | 28 | { |
30 | int c; | 29 | int c; |
@@ -35,6 +34,13 @@ static void print_file(FILE * file) | |||
35 | fflush(stdout); | 34 | fflush(stdout); |
36 | } | 35 | } |
37 | 36 | ||
37 | static const char cat_usage[] = | ||
38 | "cat [FILE]...\n" | ||
39 | #ifndef BB_FEATURE_TRIVIAL_HELP | ||
40 | "\nConcatenates FILE(s) and prints them to stdout.\n" | ||
41 | #endif | ||
42 | ; | ||
43 | |||
38 | extern int cat_main(int argc, char **argv) | 44 | extern int cat_main(int argc, char **argv) |
39 | { | 45 | { |
40 | FILE *file; | 46 | FILE *file; |
@@ -44,17 +50,11 @@ extern int cat_main(int argc, char **argv) | |||
44 | exit(TRUE); | 50 | exit(TRUE); |
45 | } | 51 | } |
46 | 52 | ||
47 | if (**(argv + 1) == '-') { | 53 | if (**(argv + 1) == '-') |
48 | usage("cat [FILE ...]\n" | 54 | usage(cat_usage); |
49 | #ifndef BB_FEATURE_TRIVIAL_HELP | ||
50 | "\nConcatenates FILE(s) and prints them to the standard output.\n" | ||
51 | #endif | ||
52 | ); | ||
53 | } | ||
54 | argc--; | ||
55 | 55 | ||
56 | while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv)) { | 56 | while (--argc > 0) { |
57 | file = fopen(*argv, "r"); | 57 | file = fopen(*++argv, "r"); |
58 | if (file == NULL) { | 58 | if (file == NULL) { |
59 | perror(*argv); | 59 | perror(*argv); |
60 | exit(FALSE); | 60 | exit(FALSE); |