Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / cat.c

diff --git a/cat.c b/cat.c
index 8718c4d02d6078d6fdc5db6a34a231a771138ca8..80044346048acdbd8c76030976f823c1feef5dce 100644 (file)
--- a/cat.c
+++ b/cat.c
@@ -1,7 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini Cat implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ * 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
  * it under the terms of the GNU General Public License as published by
@@ -22,33 +24,50 @@
 #include "internal.h"
 #include <stdio.h>
 
-const char cat_usage[] = "[file ...]";
 
-extern int cat_more_main(int argc, char **argv)
+static void print_file(FILE * file)
 {
-    int c;
-    FILE *file = stdin;
-
-    if ( (argc < 2) || (**(argv+1) == '-') ) {
-       fprintf(stderr, "Usage: %s %s", *argv, cat_usage);
-       exit(FALSE);
-    }
-    argc--;
-    argv++;
-
-    while (argc-- > 0) {
-       file = fopen(*argv, "r");
-       if (file == NULL) {
-           perror(*argv);
-           exit(FALSE);
-       }
+       int c;
+
        while ((c = getc(file)) != EOF)
-           putc(c, stdout);
+               putc(c, stdout);
        fclose(file);
        fflush(stdout);
+}
+
+extern int cat_main(int argc, char **argv)
+{
+       FILE *file;
+
+       if (argc == 1) {
+               print_file(stdin);
+               exit(TRUE);
+       }
 
+       if (**(argv + 1) == '-') {
+               usage("cat [FILE ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+                               "\nConcatenates FILE(s) and prints them to the standard output.\n"
+#endif
+                               );
+       }
        argc--;
-       argv++;
-    }
-    exit(TRUE);
+
+       while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv)) {
+               file = fopen(*argv, "r");
+               if (file == NULL) {
+                       perror(*argv);
+                       exit(FALSE);
+               }
+               print_file(file);
+       }
+       return(TRUE);
 }
+
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/