Added support for ignoring '-g' per GNU ls, thanks to David Vrabel

[oweals/busybox.git] / tee.c

diff --git a/tee.c b/tee.c
index 2f746f96d2c3dca1d7dbba32915a0d38502f8e6f..c9b5410d312347d59e200b6497bb5566844d941c 100644 (file)
--- a/tee.c
+++ b/tee.c
@@ -3,7 +3,7 @@
  * Mini tee implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 by Lineo, inc.
  * Written by John Beppu <beppu@lineo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,22 +23,25 @@
  */
 
 #include "internal.h"
+#include <errno.h>
 #include <stdio.h>
 
 static const char tee_usage[] =
-       "tee [OPTION]... [FILE]...\n\n"
-       "Copy standard input to each FILE, and also to standard output.\n\n"
+       "tee [OPTION]... [FILE]...\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nCopy standard input to each FILE, and also to standard output.\n\n"
        "Options:\n" "\t-a\tappend to the given FILEs, do not overwrite\n"
 #if 0
        "\t-i\tignore interrupt signals\n"
 #endif
+#endif
 ;
 
 
 /* FileList _______________________________________________________________ */
 
 #define FL_MAX 1024
-static FILE *FileList[FL_MAX];
+static FILE **FileList;
 static int FL_end;
 
 typedef void (FL_Function) (FILE * file, char c);
@@ -99,6 +102,11 @@ int tee_main(int argc, char **argv)
        }
 
        /* init FILE pointers */
+       FileList = calloc(FL_MAX, sizeof(FILE*));
+       if (!FileList) {
+               fprintf(stderr, "tee: %s\n", strerror(errno));
+               exit(1);
+       }
        FL_end = 0;
        FileList[0] = stdout;
        for (; i < argc; i++) {
@@ -119,7 +127,10 @@ int tee_main(int argc, char **argv)
 
        /* clean up */
        FL_apply(tee_fclose, 0);
-       exit(0);
+       /* Don't bother to close files  Exit does that 
+        * automagically, so we can save a few bytes */
+       /* free(FileList); */
+       return(0);
 }
 
-/* $Id: tee.c,v 1.6 2000/02/08 19:58:47 erik Exp $ */
+/* $Id: tee.c,v 1.11 2000/06/19 17:25:40 andersen Exp $ */