POSIX 1003.2 is not going to allow write errors to be ignored; let's

[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 ece7f0c..0fc0d8a 100644 (file)
--- a/usr/src/usr.bin/tee/tee.c
+++ b/usr/src/usr.bin/tee/tee.c
@@ -1,62 +1,114 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * 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.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1985 Regents of the University of California.\n\
+"@(#) Copyright (c) 1988 Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char *sccsid = "@(#)tee.c       5.3 (Berkeley) %G%";
-#endif
-/*
- * tee-- pipe fitting
- */
+static char sccsid[] = "@(#)tee.c      5.6 (Berkeley) %G%";
+#endif /* not lint */

 
 

-#include <stdio.h>
+#include <sys/types.h>
+#include <sys/file.h>

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

+#include <stdio.h>
+
+typedef struct _list {
+       struct _list *next;
+       int fd;
+       char *name;
+} LIST;
+LIST *head;

 
 

-main(argc,argv)
+main(argc, argv)

        int argc;
        int argc;

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

 {
 {

-       register FILE **openf, **lastf, **fdp;
-       register i, cc;
-       char buf[8192], *calloc();
-       int aflag = 0;
-
-       argc--, argv++;
-       while (argc > 0 && argv[0][0] == '-') {
-               switch (argv[0][1]) {
+       extern int errno, optind;
+       register LIST *p;
+       register int append, n, fd;
+       int ch, exitval;
+       char *buf, *malloc(), *strerror();
+       off_t lseek();
+
+       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;
                        break;

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

                }
                }

-               argv++, argc--;
+       argv += optind;
+       argc -= optind;
+
+       if (!(buf = malloc((u_int)8 * 1024))) {
+               (void)fprintf(stderr, "tee: out of space.\n");
+               exit(1);

        }
        }

-       lastf = openf = (FILE **)calloc(argc+1, sizeof (FILE *));
-       if (openf == 0) {
-               fprintf(stderr, "tee: Out of memory.\n");
-               exit(-1);
+       add(1, "stdout");
+       for (; *argv; ++argv)
+               if ((fd = open(*argv, append ? O_WRONLY|O_CREAT :
+                   O_WRONLY|O_CREAT|O_TRUNC, 0600)) < 0)
+                       (void)fprintf(stderr, "tee: %s: %s.\n",
+                           *argv, strerror(errno));
+               else {
+                       if (append)
+                               (void)lseek(fd, 0L, L_XTND);
+                       add(fd, *argv);
+               }
+       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) {
+               (void)fprintf(stderr, "tee: read: %s\n", strerror(errno));
+               exit(1);

        }
        }

-       *lastf++ = stdout;      /* default */
-       for (; argc > 0; argc--, argv++) {
-               *lastf = fopen(argv[0], aflag ? "a" : "w");
-               if (*lastf == NULL)
-                       fprintf(stderr, "tee: %s: cannot open.\n", argv[0]);
-               else
-                       lastf++;
+       exit(exitval);
+}
+
+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);

        }
        }

-       while ((cc = read(fileno(stdin), buf, sizeof (buf))) > 0)
-               for (fdp = openf; fdp < lastf; fdp++)
-                       fwrite(buf, 1, cc, *fdp);
-       exit(0);
+       p->fd = fd;
+       p->name = name;
+       p->next = head;
+       head = p;

 }
 }