BSD 4_4 release

[unix-history] / usr / src / usr.bin / tee / tee.c

diff --git a/usr/src/usr.bin/tee/tee.c b/usr/src/usr.bin/tee/tee.c
index 0d3e9fa..ad1110a 100644 (file)
--- a/usr/src/usr.bin/tee/tee.c
+++ b/usr/src/usr.bin/tee/tee.c
@@ -1,100 +1,168 @@
-#ifndef lint
-static char *sccsid = "@(#)tee.c       4.4 (Berkeley) %G%";
-#endif

 /*
 /*

- * tee-- pipe fitting
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
  */
 

-#include <signal.h>
+#ifndef lint
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)tee.c      8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#include <signal.h>

 #include <errno.h>
 #include <errno.h>

+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 
 

-#define        BUFSIZ  1024
-int openf[20] = { 1 };
-int n = 1;
-int t = 0;
-int aflag;
-
-char in[BUFSIZ];
+typedef struct _list {
+       struct _list *next;
+       int fd;
+       char *name;
+} LIST;
+LIST *head;

 
 

-char out[BUFSIZ];
+void add __P((int, char *));
+void err __P((int, const char *, ...));

 
 

-extern errno;
-long   lseek();
-
-main(argc,argv)
-char **argv;
+int
+main(argc, argv)
+       int argc;
+       char *argv[];

 {
 {

-       int register r,w,p;
-       struct stat buf;
-       while(argc>1&&argv[1][0]=='-') {
-               switch(argv[1][1]) {
+       register LIST *p;
+       register int n, fd, rval, wval;
+       register char *bp;
+       int append, ch, exitval;
+       char *buf;
+#define        BSIZE (8 * 1024)
+
+       append = 0;
+       while ((ch = getopt(argc, argv, "ai")) != EOF)
+               switch((char)ch) {

                case 'a':
                case 'a':

-                       aflag++;
+                       append = 1;

                        break;
                case 'i':
                        break;
                case 'i':

-               case 0:
-                       signal(SIGINT, SIG_IGN);
+                       (void)signal(SIGINT, SIG_IGN);
+                       break;
+               case '?':
+               default:
+                       (void)fprintf(stderr, "usage: tee [-ai] [file ...]\n");
+                       exit(1);

                }
                }

-               argv++;
-               argc--;
-       }
-       fstat(1,&buf);
-       t = (buf.st_mode&S_IFMT)==S_IFCHR;
-       if(lseek(1,0L,1)==-1&&errno==ESPIPE)
-               t++;
-       while(argc-->1) {
-               if(aflag) {
-                       openf[n] = open(argv[1],1);
-                       if(openf[n] < 0)
-                               openf[n] = creat(argv[1],0666);
-                       lseek(openf[n++],0L,2);
+       argv += optind;
+       argc -= optind;
+
+       if ((buf = malloc((u_int)BSIZE)) == NULL)
+               err(1, "%s", strerror(errno));
+
+       add(STDOUT_FILENO, "stdout");
+
+       for (exitval = 0; *argv; ++argv)
+               if ((fd = open(*argv, append ? O_WRONLY|O_CREAT|O_APPEND :
+                   O_WRONLY|O_CREAT|O_TRUNC, DEFFILEMODE)) < 0) {
+                       err(0, "%s: %s", *argv, strerror(errno));
+                       exitval = 1;

                } else
                } else

-                       openf[n++] = creat(argv[1],0666);
-               if(stat(argv[1],&buf)>=0) {
-                       if((buf.st_mode&S_IFMT)==S_IFCHR)
-                               t++;
-               } else {
-                       puts("tee: cannot open ");
-                       puts(argv[1]);
-                       puts("\n");
-                       n--;
-               }
-               argv++;
-       }
-       r = w = 0;
-       for(;;) {
-               for(p=0;p<BUFSIZ;) {
-                       if(r>=w) {
-                               if(t>0&&p>0) break;
-                               w = read(0,in,BUFSIZ);
-                               r = 0;
-                               if(w<=0) {
-                                       stash(p);
-                                       exit(0);
+                       add(fd, *argv);
+
+       while ((rval = read(STDIN_FILENO, buf, BSIZE)) > 0)
+               for (p = head; p; p = p->next) {
+                       n = rval;
+                       bp = buf;
+                       do {
+                               if ((wval = write(p->fd, bp, n)) == -1) {
+                                       err(0, "%s: %s",
+                                           p->name, strerror(errno));
+                                       exitval = 1;
+                                       break;

                                }
                                }

-                       }
-                       out[p++] = in[r++];
+                               bp += wval;
+                       } while (n -= wval);

                }
                }

-               stash(p);
-       }
+       if (rval < 0)
+               err(1, "read: %s", strerror(errno));
+       exit(exitval);

 }
 
 }
 

-stash(p)
+void
+add(fd, name)
+       int fd;
+       char *name;

 {
 {

-       int k;
-       int i;
-       int d;
-       d = t ? 16 : p;
-       for(i=0; i<p; i+=d)
-               for(k=0;k<n;k++)
-                       write(openf[k], out+i, d<p-i?d:p-i);
+       LIST *p;
+
+       if ((p = malloc((u_int)sizeof(LIST))) == NULL)
+               err(1, "%s", strerror(errno));
+       p->fd = fd;
+       p->name = name;
+       p->next = head;
+       head = p;

 }
 
 }
 

-puts(s)
-char *s;
+#if __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+void
+#if __STDC__
+err(int doexit, const char *fmt, ...)
+#else
+err(doexit, fmt, va_alist)
+       int doexit;
+       char *fmt;
+        va_dcl
+#endif

 {
 {

-       while(*s)
-               write(2,s++,1);
+       va_list ap;
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       (void)fprintf(stderr, "tee: ");
+       (void)vfprintf(stderr, fmt, ap);
+       va_end(ap);
+       (void)fprintf(stderr, "\n");
+       if (doexit)
+               exit(1);

 }
 }