making note of my changes.

[oweals/busybox.git] / cat.c

diff --git a/cat.c b/cat.c
index 38078d505e0b5d2874126dae9c13f6f4d1dedab0..0d32efe84958913481df5715a64029a954aa3095 100644 (file)
--- a/cat.c
+++ b/cat.c
@@ -1,7 +1,8 @@
 /*
  * Mini Cat implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999 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
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +33,7 @@ static void print_file( FILE *file)
     fflush(stdout);
 }
 
-extern int cat_more_main(int argc, char **argv)
+extern int cat_main(int argc, char **argv)
 {
     FILE *file;
 
@@ -45,17 +46,14 @@ extern int cat_more_main(int argc, char **argv)
        usage ("cat [file ...]\n");
     }
     argc--;
-    argv++;
 
-    while (argc-- > 0) {
+    while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv) ) {
        file = fopen(*argv, "r");
        if (file == NULL) {
            perror(*argv);
            exit(FALSE);
        }
        print_file( file);
-       argc--;
-       argv++;
     }
     exit(TRUE);
 }