386BSD 0.1 development

[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 0fc0d8a..5608be1 100644 (file)
--- a/usr/src/usr.bin/tee/tee.c
+++ b/usr/src/usr.bin/tee/tee.c
@@ -2,17 +2,33 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -22,13 +38,17 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)tee.c      5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)tee.c      5.11 (Berkeley) 5/6/91";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>

-#include <sys/file.h>
+#include <sys/stat.h>
+#include <fcntl.h>

 #include <signal.h>
 #include <signal.h>

+#include <unistd.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>

 
 typedef struct _list {
        struct _list *next;
 
 typedef struct _list {
        struct _list *next;


@@ -43,9 +63,10 @@ main(argc, argv)
 {
        extern int errno, optind;
        register LIST *p;
 {
        extern int errno, optind;
        register LIST *p;

-       register int append, n, fd;
-       int ch, exitval;
-       char *buf, *malloc(), *strerror();
+       register int n, fd, rval, wval;
+       register char *bp;
+       int append, ch, exitval;
+       char *buf;

        off_t lseek();
 
        append = 0;
        off_t lseek();
 
        append = 0;


@@ -69,26 +90,30 @@ main(argc, argv)
                (void)fprintf(stderr, "tee: out of space.\n");
                exit(1);
        }
                (void)fprintf(stderr, "tee: out of space.\n");
                exit(1);
        }

-       add(1, "stdout");
+       add(STDOUT_FILENO, "stdout");

        for (; *argv; ++argv)
        for (; *argv; ++argv)

-               if ((fd = open(*argv, append ? O_WRONLY|O_CREAT :
-                   O_WRONLY|O_CREAT|O_TRUNC, 0600)) < 0)
+               if ((fd = open(*argv, append ? O_WRONLY|O_CREAT|O_APPEND :
+                   O_WRONLY|O_CREAT|O_TRUNC, DEFFILEMODE)) < 0)

                        (void)fprintf(stderr, "tee: %s: %s.\n",
                            *argv, strerror(errno));
                        (void)fprintf(stderr, "tee: %s: %s.\n",
                            *argv, strerror(errno));

-               else {
-                       if (append)
-                               (void)lseek(fd, 0L, L_XTND);
+               else

                        add(fd, *argv);
                        add(fd, *argv);

-               }

        exitval = 0;
        exitval = 0;

-       while ((n = read(0, buf, sizeof(buf))) > 0)
-               for (p = head; p; p = p->next)
-                       if (write(p->fd, buf, n) != n) {
-                               (void)fprintf(stderr, "tee: %s: %s.\n",
-                                   p->name, strerror(errno));
-                               exitval = 1;
-                       }
-       if (n < 0) {
+       while ((rval = read(STDIN_FILENO, buf, sizeof(buf))) > 0)
+               for (p = head; p; p = p->next) {
+                       n = rval;
+                       bp = buf;
+                       do {
+                               if ((wval = write(p->fd, bp, n)) == -1) {
+                                       (void)fprintf(stderr, "tee: %s: %s.\n",
+                                           p->name, strerror(errno));
+                                       exitval = 1;
+                                       break;
+                               }
+                               bp += wval;
+                       } while (n -= wval);
+               }
+       if (rval < 0) {

                (void)fprintf(stderr, "tee: read: %s\n", strerror(errno));
                exit(1);
        }
                (void)fprintf(stderr, "tee: read: %s\n", strerror(errno));
                exit(1);
        }


@@ -100,10 +125,8 @@ add(fd, name)
        char *name;
 {
        LIST *p;
        char *name;
 {
        LIST *p;

-       char *malloc(), *strerror();

 
 

-       /* NOSTRICT */
-       if (!(p = (LIST *)malloc((u_int)sizeof(LIST)))) {
+       if (!(p = malloc((u_int)sizeof(LIST)))) {

                (void)fprintf(stderr, "tee: out of space.\n");
                exit(1);
        }
                (void)fprintf(stderr, "tee: out of space.\n");
                exit(1);
        }