Rewritten by mistake.

author: Matt Kraai <kraai@debian.org> 2000-08-28 03:53:27 +0000
committer: Matt Kraai <kraai@debian.org> 2000-08-28 03:53:27 +0000
commit: 1638488d26ef88e29ada0cb6faa12ac03c6705d5 (patch)
tree: 74e1db41e2fc1b4211bdb131519a88a47911e1e0 /coreutils/tee.c
parent: ab60f6987a8283f60988c7e7806bd7fbfd86fbd3 (diff)
download: busybox-w32-1638488d26ef88e29ada0cb6faa12ac03c6705d5.tar.gz
busybox-w32-1638488d26ef88e29ada0cb6faa12ac03c6705d5.tar.bz2
busybox-w32-1638488d26ef88e29ada0cb6faa12ac03c6705d5.zip
1 files changed, 32 insertions, 88 deletions
diff --git a/coreutils/tee.c b/coreutils/tee.c
index c15408b51..dc9876020 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -2,9 +2,8 @@
 /*
 * Mini tee implementation for busybox
 *
- *
 * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by John Beppu <beppu@lineo.com>
+ * Written by Matt Kraai <kraai@alumni.carnegiemellon.edu>
 *
 * 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
@@ -23,102 +22,47 @@
 */
 #include "internal.h"
-#include <errno.h>
+#include <getopt.h>
 #include <stdio.h>
-/* FileList _______________________________________________________________ */
+int
+tee_main(int argc, char **argv)
-#define FL_MAX  1024
-static FILE **FileList;
-static int FL_end;
-typedef void (FL_Function) (FILE * file, char c);
-/* apply a function to everything in FileList */
-static void FL_apply(FL_Function * f, char 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)
-{
-        fputc(c, file);
-}
-/* FL_Function for closing files */
-static void tee_fclose(FILE * file, char c)
-{
-        fclose(file);
-}
-/* ________________________________________________________________________ */
-/* BusyBoxed tee(1) */
-int tee_main(int argc, char **argv)
 {
-        int i;
+        char *mode = "w";
-        char c;
+        int c, i, status = 0, nfiles = 0;
-        char opt;
+        FILE **files;
-        char opt_fopen[2] = "w";
-        FILE *file;
+        while ((c = getopt(argc, argv, "a")) != EOF) {
+                switch (c) {
-        /* parse argv[] */
+                case 'a': 
-        for (i = 1; i < argc; i++) {
+                        mode = "a";
-                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;
+                default:
+                        usage(tee_usage);
                }
        }
-        /* init FILE pointers */
+        files = (FILE **)xmalloc(sizeof(FILE *) * (argc - optind + 1));
-        FileList = calloc(FL_MAX, sizeof(FILE*));
+        files[nfiles++] = stdout;
-        if (!FileList) {
+        while (optind < argc) {
-                errorMsg("%s\n", strerror(errno));
+                if ((files[nfiles++] = fopen(argv[optind++], mode)) == NULL) {
-                exit(1);
+                        nfiles--;
-        }
+                        errorMsg("%s: %s\n", argv[optind-1], strerror(errno));
-        FL_end = 0;
+                        status = 1;
-        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 = getchar()) != EOF)
-        while ((c = (char) getchar()) && (!feof(stdin))) {
+                for (i = 0; i < nfiles; i++)
-                FL_apply(tee_fwrite, c);
+                        putc(c, files[i]);
-        }
-        /* clean up */
+        return status;
-        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.13 2000/07/16 20:57:15 kraai Exp $ */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
author	Matt Kraai <kraai@debian.org>	2000-08-28 03:53:27 +0000
committer	Matt Kraai <kraai@debian.org>	2000-08-28 03:53:27 +0000
commit	1638488d26ef88e29ada0cb6faa12ac03c6705d5 (patch)
tree	74e1db41e2fc1b4211bdb131519a88a47911e1e0 /coreutils/tee.c
parent	ab60f6987a8283f60988c7e7806bd7fbfd86fbd3 (diff)
download	busybox-w32-1638488d26ef88e29ada0cb6faa12ac03c6705d5.tar.gz busybox-w32-1638488d26ef88e29ada0cb6faa12ac03c6705d5.tar.bz2 busybox-w32-1638488d26ef88e29ada0cb6faa12ac03c6705d5.zip

diff --git a/coreutils/tee.c b/coreutils/tee.c index c15408b51..dc9876020 100644 --- a/coreutils/tee.c +++ b/coreutils/tee.c
@@ -2,9 +2,8 @@
2	/*	2	/*
3	* Mini tee implementation for busybox	3	* Mini tee implementation for busybox
4	*	4	*
5	*
6	* Copyright (C) 1999,2000 by Lineo, inc.	5	* Copyright (C) 1999,2000 by Lineo, inc.
7	* Written by John Beppu <beppu@lineo.com>	6	* Written by Matt Kraai <kraai@alumni.carnegiemellon.edu>
8	*	7	*
9	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
@@ -23,102 +22,47 @@
23	*/	22	*/
24		23
25	#include "internal.h"	24	#include "internal.h"
26	#include <errno.h>	25	#include <getopt.h>
27	#include <stdio.h>	26	#include <stdio.h>
28		27
29	/* FileList _______________________________________________________________ */	28	int
30		29	tee_main(int argc, char **argv)
31	#define FL_MAX 1024
32	static FILE **FileList;
33	static int FL_end;
34
35	typedef void (FL_Function) (FILE * file, char c);
36
37
38	/* apply a function to everything in FileList */
39	static void FL_apply(FL_Function * f, char c)
40	{
41	int i;
42
43	for (i = 0; i <= FL_end; i++) {
44	f(FileList[i], c);
45	}
46	}
47
48	/* FL_Function for writing to files*/
49	static void tee_fwrite(FILE * file, char c)
50	{
51	fputc(c, file);
52	}
53
54	/* FL_Function for closing files */
55	static void tee_fclose(FILE * file, char c)
56	{
57	fclose(file);
58	}
59
60	/* ________________________________________________________________________ */
61
62	/* BusyBoxed tee(1) */
63	int tee_main(int argc, char **argv)
64	{	30	{
65	int i;	31	char *mode = "w";
66	char c;	32	int c, i, status = 0, nfiles = 0;
67	char opt;	33	FILE **files;
68	char opt_fopen[2] = "w";	34
69	FILE *file;	35	while ((c = getopt(argc, argv, "a")) != EOF) {
70		36	switch (c) {
71	/* parse argv[] */	37	case 'a':
72	for (i = 1; i < argc; i++) {	38	mode = "a";
73	if (argv[i][0] == '-') {
74	opt = argv[i][1];
75	switch (opt) {
76	case 'a':
77	opt_fopen[0] = 'a';
78	break;
79	#if 0
80	case 'i':
81	fprintf(stderr, "ignore interrupt not implemented\n");
82	break;
83	#endif
84	default:
85	usage(tee_usage);
86	}
87	} else {
88	break;	39	break;
		40	default:
		41	usage(tee_usage);
89	}	42	}
90	}	43	}
91		44
92	/* init FILE pointers */	45	files = (FILE *)xmalloc(sizeof(FILE ) * (argc - optind + 1));
93	FileList = calloc(FL_MAX, sizeof(FILE*));	46	files[nfiles++] = stdout;
94	if (!FileList) {	47	while (optind < argc) {
95	errorMsg("%s\n", strerror(errno));	48	if ((files[nfiles++] = fopen(argv[optind++], mode)) == NULL) {
96	exit(1);	49	nfiles--;
97	}	50	errorMsg("%s: %s\n", argv[optind-1], strerror(errno));
98	FL_end = 0;	51	status = 1;
99	FileList[0] = stdout;
100	for (; i < argc; i++) {
101	/* add a file to FileList */
102	file = fopen(argv[i], opt_fopen);
103	if (!file) {
104	continue;
105	}
106	if (FL_end < FL_MAX) {
107	FileList[++FL_end] = file;
108	}	52	}
109	}	53	}
110		54
111	/* read and redirect */	55	while ((c = getchar()) != EOF)
112	while ((c = (char) getchar()) && (!feof(stdin))) {	56	for (i = 0; i < nfiles; i++)
113	FL_apply(tee_fwrite, c);	57	putc(c, files[i]);
114	}
115		58
116	/* clean up */	59	return status;
117	FL_apply(tee_fclose, 0);
118	/* Don't bother to close files Exit does that
119	* automagically, so we can save a few bytes */
120	/* free(FileList); */
121	return(0);
122	}	60	}
123		61
124	/* $Id: tee.c,v 1.13 2000/07/16 20:57:15 kraai Exp $ */	62	/*
		63	Local Variables:
		64	c-file-style: "linux"
		65	c-basic-offset: 4
		66	tab-width: 4
		67	End:
		68	*/