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 7f40e77..ad1110a 100644 (file)
--- a/usr/src/usr.bin/tee/tee.c
+++ b/usr/src/usr.bin/tee/tee.c
@@ -1,25 +1,55 @@
 /*
 /*

- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * 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

-char copyright[] =
-"@(#) Copyright (c) 1988 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)tee.c      5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)tee.c      8.1 (Berkeley) 6/6/93";

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

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

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

-#include <stdio.h>
+#include <errno.h>
+#include <fcntl.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;


@@ -28,17 +58,20 @@ typedef struct _list {
 } LIST;
 LIST *head;
 
 } LIST;
 LIST *head;
 

+void add __P((int, char *));
+void err __P((int, const char *, ...));
+
+int

 main(argc, argv)
        int argc;
 main(argc, argv)
        int argc;

-       char **argv;
+       char *argv[];

 {
 {

-       extern int errno, optind;

        register LIST *p;
        register int n, fd, rval, wval;
        register char *bp;
        int append, ch, exitval;
        register LIST *p;
        register int n, fd, rval, wval;
        register char *bp;
        int append, ch, exitval;

-       char *buf, *malloc(), *strerror();
-       off_t lseek();
+       char *buf;
+#define        BSIZE (8 * 1024)

 
        append = 0;
        while ((ch = getopt(argc, argv, "ai")) != EOF)
 
        append = 0;
        while ((ch = getopt(argc, argv, "ai")) != EOF)


@@ -57,26 +90,26 @@ main(argc, argv)
        argv += optind;
        argc -= optind;
 
        argv += optind;
        argc -= optind;
 

-       if (!(buf = malloc((u_int)8 * 1024))) {
-               (void)fprintf(stderr, "tee: out of space.\n");
-               exit(1);
-       }
+       if ((buf = malloc((u_int)BSIZE)) == NULL)
+               err(1, "%s", strerror(errno));
+

        add(STDOUT_FILENO, "stdout");
        add(STDOUT_FILENO, "stdout");

-       for (; *argv; ++argv)
+
+       for (exitval = 0; *argv; ++argv)

                if ((fd = open(*argv, append ? O_WRONLY|O_CREAT|O_APPEND :
                if ((fd = open(*argv, append ? O_WRONLY|O_CREAT|O_APPEND :

-                   O_WRONLY|O_CREAT|O_TRUNC, 0600)) < 0)
-                       (void)fprintf(stderr, "tee: %s: %s.\n",
-                           *argv, strerror(errno));
-               else
+                   O_WRONLY|O_CREAT|O_TRUNC, DEFFILEMODE)) < 0) {
+                       err(0, "%s: %s", *argv, strerror(errno));
+                       exitval = 1;
+               } else

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

-       exitval = 0;
-       while ((rval = read(STDIN_FILENO, buf, sizeof(buf))) > 0)
+
+       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) {
                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",
+                                       err(0, "%s: %s",

                                            p->name, strerror(errno));
                                        exitval = 1;
                                        break;
                                            p->name, strerror(errno));
                                        exitval = 1;
                                        break;


@@ -84,27 +117,52 @@ main(argc, argv)
                                bp += wval;
                        } while (n -= wval);
                }
                                bp += wval;
                        } while (n -= wval);
                }

-       if (rval < 0) {
-               (void)fprintf(stderr, "tee: read: %s\n", strerror(errno));
-               exit(1);
-       }
+       if (rval < 0)
+               err(1, "read: %s", strerror(errno));

        exit(exitval);
 }
 
        exit(exitval);
 }
 

+void

 add(fd, name)
        int fd;
        char *name;
 {
        LIST *p;
 add(fd, name)
        int fd;
        char *name;
 {
        LIST *p;

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

 
 

-       /* NOSTRICT */
-       if (!(p = (LIST *)malloc((u_int)sizeof(LIST)))) {
-               (void)fprintf(stderr, "tee: out of space.\n");
-               exit(1);
-       }
+       if ((p = malloc((u_int)sizeof(LIST))) == NULL)
+               err(1, "%s", strerror(errno));

        p->fd = fd;
        p->name = name;
        p->next = head;
        head = p;
 }
        p->fd = fd;
        p->name = name;
        p->next = head;
        head = p;
 }

+
+#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
+{
+       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);
+}