BSD 4_3_Net_2 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 65cb52e..5608be1 100644 (file)
--- a/usr/src/usr.bin/tee/tee.c
+++ b/usr/src/usr.bin/tee/tee.c
@@ -2,19 +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: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. 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 ``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


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

-static char sccsid[] = "@(#)tee.c      5.10 (Berkeley) 6/1/90";
+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 <stdio.h>

 #include <unistd.h>
 #include <unistd.h>

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

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


@@ -49,7 +66,7 @@ main(argc, argv)
        register int n, fd, rval, wval;
        register char *bp;
        int append, ch, exitval;
        register int n, fd, rval, wval;
        register char *bp;
        int append, ch, exitval;

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

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


@@ -76,7 +93,7 @@ main(argc, argv)
        add(STDOUT_FILENO, "stdout");
        for (; *argv; ++argv)
                if ((fd = open(*argv, append ? O_WRONLY|O_CREAT|O_APPEND :
        add(STDOUT_FILENO, "stdout");
        for (; *argv; ++argv)
                if ((fd = open(*argv, append ? O_WRONLY|O_CREAT|O_APPEND :

-                   O_WRONLY|O_CREAT|O_TRUNC, 0600)) < 0)
+                   O_WRONLY|O_CREAT|O_TRUNC, DEFFILEMODE)) < 0)

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


@@ -108,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);
        }