Comment on kill.c change.

[oweals/busybox.git] / tee.c

diff --git a/tee.c b/tee.c
index 45128b568fccecdff4f8ab33ff1851fc3e0180d2..c9b5410d312347d59e200b6497bb5566844d941c 100644 (file)
--- a/tee.c
+++ b/tee.c
@@ -1,8 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * 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
@@ -22,117 +23,114 @@
  */
 
 #include "internal.h"
+#include <errno.h>
 #include <stdio.h>
 
 static const char tee_usage[] =
-"Usage: tee [OPTION]... [FILE]...\n"
-"Copy standard input to each FILE, and also to standard output.\n\n"
-"  -a,    append to the given FILEs, do not overwrite\n"
-"  -i,    ignore interrupt signals\n"
-"  -h,    this help message\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 int  FL_end;
-
-typedef void (FL_Function)(FILE *file, char c);
-    
-/* initialize FileList */
-static void
-FL_init()
-{
-    FL_end = 0;
-    FileList[0] = stdout;
-}
+static FILE **FileList;
+static int FL_end;
+
+typedef void (FL_Function) (FILE * file, char c);
 
-/* add a file to FileList */
-static int
-FL_add(const char *filename, char *opt_open)
-{
-    FILE    *file;
-
-    file = fopen(filename, opt_open);
-    if (!file) { return 0; };
-    if (FL_end < FL_MAX) {
-       FileList[++FL_end] = file;
-    }
-    return 1;
-}
 
 /* apply a function to everything in FileList */
-static void
-FL_apply(FL_Function *f, char c)
+static void FL_apply(FL_Function * f, char c)
 {
-    int i;
-    for (i = 0; i <= FL_end; i++) {
-       f(FileList[i], c);
-    }
-}
+       int i;
 
-/* ________________________________________________________________________ */
+       for (i = 0; i <= FL_end; i++) {
+               f(FileList[i], c);
+       }
+}
 
 /* FL_Function for writing to files*/
-static void
-tee_fwrite(FILE *file, char c)
+static void tee_fwrite(FILE * file, char c)
 {
-    fputc(c, file);
+       fputc(c, file);
 }
 
 /* FL_Function for closing files */
-static void
-tee_fclose(FILE *file, char c)
+static void tee_fclose(FILE * file, char c)
 {
-    fclose(file);
+       fclose(file);
 }
 
+/* ________________________________________________________________________ */
+
 /* BusyBoxed tee(1) */
-int
-tee_main(int argc, char **argv)
+int tee_main(int argc, char **argv)
 {
-    int            i;
-    char    c;
-    char    opt;
-    char    opt_fopen[2] = "w";
-
-    /* parse argv[] */
-    for (i = 1; i < argc; i++) {
-       if (argv[i][0] == '-') {
-           opt = argv[i][1];
-           switch (opt) {
-               case 'a':
-                   opt_fopen[0] = 'a';
-                   break;
-               case 'i':
-                   fprintf(stderr, "ingore interrupt not implemented\n");
-                   break;
-               case 'h':
-                   usage(tee_usage);
-                   break;
-               default:
-                   fprintf(stderr, "tee: invalid option -- %c\n", opt);
-                   usage(tee_usage);
-           }
-       } else {
-           break;
+       int i;
+       char c;
+       char opt;
+       char opt_fopen[2] = "w";
+       FILE *file;
+
+       /* parse argv[] */
+       for (i = 1; i < argc; i++) {
+               if (argv[i][0] == '-') {
+                       opt = argv[i][1];
+                       switch (opt) {
+                       case 'a':
+                               opt_fopen[0] = 'a';
+                               break;
+#if 0
+                       case 'i':
+                               fprintf(stderr, "ignore interrupt not implemented\n");
+                               break;
+#endif
+                       default:
+                               usage(tee_usage);
+                       }
+               } else {
+                       break;
+               }
+       }
+
+       /* init FILE pointers */
+       FileList = calloc(FL_MAX, sizeof(FILE*));
+       if (!FileList) {
+               fprintf(stderr, "tee: %s\n", strerror(errno));
+               exit(1);
        }
-    }
-
-    /* init FILE pointers */
-    FL_init();
-    for ( ; i < argc; i++) {
-       FL_add(argv[i], opt_fopen);
-    }
-
-    /* read and redirect */
-    while ((c = (char) getchar()) && (!feof(stdin))) {
-       FL_apply(tee_fwrite, c);
-    }
-
-    /* clean up */
-    FL_apply(tee_fclose, 0);
-    exit(0);
+       FL_end = 0;
+       FileList[0] = stdout;
+       for (; i < argc; i++) {
+               /* add a file to FileList */
+               file = fopen(argv[i], opt_fopen);
+               if (!file) {
+                       continue;
+               }
+               if (FL_end < FL_MAX) {
+                       FileList[++FL_end] = file;
+               }
+       }
+
+       /* read and redirect */
+       while ((c = (char) getchar()) && (!feof(stdin))) {
+               FL_apply(tee_fwrite, c);
+       }
+
+       /* clean up */
+       FL_apply(tee_fclose, 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.3 1999/12/10 07:41:03 beppu Exp $ */
+/* $Id: tee.c,v 1.11 2000/06/19 17:25:40 andersen Exp $ */