Update to changelog -- mostly from Larry Doolittle.

[oweals/busybox.git] / cat.c

diff --git a/cat.c b/cat.c
index f7a6bfa7b8df122f86358feab8c5491506260998..151ce4e61fa79ede7c05582e1262628a192f8d4d 100644 (file)
--- a/cat.c
+++ b/cat.c
@@ -21,43 +21,26 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 
-
-static void print_file(FILE * file)
-{
-       int c;
-
-       while ((c = getc(file)) != EOF)
-               putc(c, stdout);
-       fclose(file);
-       fflush(stdout);
-}
-
 extern int cat_main(int argc, char **argv)
 {
-       FILE *file;
+       int status = EXIT_SUCCESS;
 
        if (argc == 1) {
                print_file(stdin);
-               exit(TRUE);
-       }
-
-       if (**(argv + 1) == '-') {
-               usage("cat [file ...]\n");
+               return status;
        }
-       argc--;
 
-       while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv)) {
-               file = fopen(*argv, "r");
-               if (file == NULL) {
-                       perror(*argv);
-                       exit(FALSE);
+       while (--argc > 0) {
+               if(!(strcmp(*++argv, "-"))) {
+                       print_file(stdin);
+               } else if (print_file_by_name(*argv) == FALSE) {
+                       status = EXIT_FAILURE;
                }
-               print_file(file);
        }
-       exit(TRUE);
+       return status;
 }
 
 /*