jfb2 writes in Bug 119:

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

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 6a9204fe7bfe93bbfa7c898eaba3453a616a182f..62af6c5d54495c384df9f6f2fb65fc393f4698b9 100644 (file)
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -1,9 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini Cat implementation for busybox
+ * cat implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@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
@@ -21,32 +20,48 @@
  *
  */
 
-#include "internal.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.
+ */
+
+#include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
+#include "busybox.h"
 
 extern int cat_main(int argc, char **argv)
 {
-       if (argc == 1) {
-               print_file(stdin);
-               exit(TRUE);
-       }
+       FILE *f;
+       int retval = EXIT_SUCCESS;
 
-       if (**(argv + 1) == '-')
-               usage(cat_usage);
+       bb_getopt_ulflags(argc, argv, "u");
 
-       while (--argc > 0) {
-               if (print_file_by_name(*++argv) == FALSE) {
-                       perror(*argv);
-                       exit(FALSE);
-               }
+       argv += optind;
+       if (!*argv) {
+               *--argv = "-";
        }
-       return(TRUE);
-}
 
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+       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;
+}