Fix up some silly macros and use xmalloc and friends exclusively.

[oweals/busybox.git] / cat.c

diff --git a/cat.c b/cat.c
index 12faf55abb01ef32d3cd8fbc7b728f99cb117b36..3554008f851a63c2b61db9f465708df2479f8b08 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,2001 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
@@ -19,36 +21,32 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
+#include <stdlib.h>
+#include "busybox.h"
 
-const char cat_usage[] = "[file ...]";
-
-extern int cat_more_main(int argc, char **argv)
+extern int cat_main(int argc, char **argv)
 {
-    int c;
-    FILE *file = stdin;
-
-    if (argc < 2) {
-       fprintf(stderr, "Usage: %s %s", *argv, cat_usage);
-       return 1;
-    }
-    argc--;
-    argv++;
+       int status = EXIT_SUCCESS;
 
-    while (argc-- > 0) {
-       file = fopen(*argv, "r");
-       if (file == NULL) {
-           name_and_error(*argv);
-           return 1;
+       if (argc == 1) {
+               print_file(stdin);
+               return status;
        }
-       while ((c = getc(file)) != EOF)
-           putc(c, stdout);
-       fclose(file);
-       fflush(stdout);
 
-       argc--;
-       argv++;
-    }
-    return 0;
+       while (--argc > 0) {
+               if(!(strcmp(*++argv, "-"))) {
+                       print_file(stdin);
+               } else if (print_file_by_name(*argv) == FALSE) {
+                       status = EXIT_FAILURE;
+               }
+       }
+       return status;
 }
+
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/