Update to changelog -- mostly from Larry Doolittle.

[oweals/busybox.git] / cat.c

diff --git a/cat.c b/cat.c
index 0d32efe84958913481df5715a64029a954aa3095..151ce4e61fa79ede7c05582e1262628a192f8d4d 100644 (file)
--- a/cat.c
+++ b/cat.c
@@ -1,7 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini Cat implementation for busybox
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,40 +21,32 @@
  *
  */
 
-#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");
-    }
-    argc--;
+       if (argc == 1) {
+               print_file(stdin);
+               return status;
+       }
 
-    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;
 }
+
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/