- add a colorful "valid HTML 4.01 Transitional" button to be able to check the refere...

[oweals/busybox.git] / coreutils / cat.c

diff --git a/coreutils/cat.c b/coreutils/cat.c
index da91d1db9dd63abd5b573505c0ce6149140e4650..9645f6143c22213d7a77e5ff3e88838e7e1d27a2 100644 (file)
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -1,8 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
- * Mini Cat implementation for busybox
+ * cat implementation for busybox
  *
- * Copyright (C) 1999 by Lineo, inc.
- * Written by Erik Andersen <andersee@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
@@ -20,43 +20,48 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
 
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * This is a new implementation of 'cat' which aims to be SUSv3 compliant.
+ *
+ * Changes from the previous implementation include:
+ * 1) Multiple '-' args are accepted as required by SUSv3.  The previous
+ *    implementation would close stdin and segfault on a subsequent '-'.
+ * 2) The '-u' options is required by SUSv3.  Note that the specified
+ *    behavior for '-u' is done by default, so all we need do is accept
+ *    the option.
+ */
 
-static void print_file( FILE *file) 
-{
-    int c;
-    while ((c = getc(file)) != EOF)
-       putc(c, stdout);
-    fclose(file);
-    fflush(stdout);
-}
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include "busybox.h"
 
-extern int cat_main(int argc, char **argv)
+int cat_main(int argc, char **argv)
 {
-    FILE *file;
-
-    if (argc==1) {
-       print_file( stdin);
-       exit( TRUE);
-    }
-
-    if ( **(argv+1) == '-' ) {
-       usage ("cat [file ...]\n");
-    }
-    argc--;
-    argv++;
-
-    while (argc-- > 0) {
-       file = fopen(*argv, "r");
-       if (file == NULL) {
-           perror(*argv);
-           exit(FALSE);
+       FILE *f;
+       int retval = EXIT_SUCCESS;
+
+       bb_getopt_ulflags(argc, argv, "u");
+
+       argv += optind;
+       if (!*argv) {
+               *--argv = "-";
        }
-       print_file( file);
-       argc--;
-       argv++;
-    }
-    exit(TRUE);
+
+       do {
+               if ((f = bb_wfopen_input(*argv)) != NULL) {
+                       int r = bb_copyfd_eof(fileno(f), STDOUT_FILENO);
+                       bb_fclose_nonstdin(f);
+                       if (r >= 0) {
+                               continue;
+                       }
+               }
+               retval = EXIT_FAILURE;
+       } while (*++argv);
+
+       return retval;
 }