BSD 4_4 release

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

diff --git a/usr/src/usr.bin/tail/tail.c b/usr/src/usr.bin/tail/tail.c
index 6fc16f3..cc8ea14 100644 (file)
--- a/usr/src/usr.bin/tail/tail.c
+++ b/usr/src/usr.bin/tail/tail.c
@@ -1,21 +1,47 @@
 /*-
 /*-

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

  *
  * This code is derived from software contributed to Berkeley by
  * Edward Sze-Tyan Wang.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Edward Sze-Tyan Wang.
  *

- * %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) 1991 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1991, 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[] = "@(#)tail.c     5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)tail.c     8.1 (Berkeley) 6/6/93";

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


@@ -33,9 +59,10 @@ char *fname;
 static void obsolete __P((char **));
 static void usage __P((void));
 
 static void obsolete __P((char **));
 static void usage __P((void));
 

+int

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

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

 {
        struct stat sb;
        FILE *fp;
 {
        struct stat sb;
        FILE *fp;


@@ -56,25 +83,25 @@ main(argc, argv)
         * number of characters in reverse order.  Finally, the default for
         * -r is the entire file, not 10 lines.
         */
         * number of characters in reverse order.  Finally, the default for
         * -r is the entire file, not 10 lines.
         */

-#define        ARG(units, forward, backward) { \
-       if (style) \
-               usage(); \
-       off = strtol(optarg, &p, 10) * (units); \
-       if (*p) \
-               err(1, "illegal offset -- %s", optarg); \
-       switch(optarg[0]) { \
-       case '+': \
-               if (off) \
-                       off -= (units); \
-                       style = (forward); \
-               break; \
-       case '-': \
-               off = -off; \
-               /* FALLTHROUGH */ \
-       default: \
-               style = (backward); \
-               break; \
-       } \
+#define        ARG(units, forward, backward) {                                 \
+       if (style)                                                      \
+               usage();                                                \
+       off = strtol(optarg, &p, 10) * (units);                         \
+       if (*p)                                                         \
+               err(1, "illegal offset -- %s", optarg);                 \
+       switch(optarg[0]) {                                             \
+       case '+':                                                       \
+               if (off)                                                \
+                       off -= (units);                                 \
+                       style = (forward);                              \
+               break;                                                  \
+       case '-':                                                       \
+               off = -off;                                             \
+               /* FALLTHROUGH */                                       \
+       default:                                                        \
+               style = (backward);                                     \
+               break;                                                  \
+       }                                                               \

 }
 
        obsolete(argv);
 }
 
        obsolete(argv);


@@ -103,6 +130,9 @@ main(argc, argv)
        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 

+       if (fflag && argc > 1)
+               err(1, "-f option only appropriate for a single file");
+

        /*
         * If displaying in reverse, don't permit follow option, and convert
         * style values.
        /*
         * If displaying in reverse, don't permit follow option, and convert
         * style values.


@@ -112,7 +142,7 @@ main(argc, argv)
                        usage();
                if (style == FBYTES)
                        style = RBYTES;
                        usage();
                if (style == FBYTES)
                        style = RBYTES;

-               if (style == FLINES)
+               else if (style == FLINES)

                        style = RLINES;
        }
 
                        style = RLINES;
        }
 


@@ -131,7 +161,8 @@ main(argc, argv)
 
        if (*argv)
                for (first = 1; fname = *argv++;) {
 
        if (*argv)
                for (first = 1; fname = *argv++;) {

-                       if ((fp = fopen(fname, "r")) == NULL) {
+                       if ((fp = fopen(fname, "r")) == NULL ||
+                           fstat(fileno(fp), &sb)) {

                                ierr();
                                continue;
                        }
                                ierr();
                                continue;
                        }


@@ -139,18 +170,19 @@ main(argc, argv)
                                (void)printf("%s==> %s <==\n",
                                    first ? "" : "\n", fname);
                                first = 0;
                                (void)printf("%s==> %s <==\n",
                                    first ? "" : "\n", fname);
                                first = 0;

+                               (void)fflush(stdout);

                        }
 
                        if (rflag)
                                reverse(fp, style, off, &sb);
                        else
                                forward(fp, style, off, &sb);
                        }
 
                        if (rflag)
                                reverse(fp, style, off, &sb);
                        else
                                forward(fp, style, off, &sb);

+                       (void)fclose(fp);

                }
        else {
                }
        else {

-               fp = stdin;

                fname = "stdin";
 
                fname = "stdin";
 

-               if (fstat(fileno(fp), &sb)) {
+               if (fstat(fileno(stdin), &sb)) {

                        ierr();
                        exit(1);
                }
                        ierr();
                        exit(1);
                }


@@ -159,15 +191,16 @@ main(argc, argv)
                 * Determine if input is a pipe.  4.4BSD will set the SOCKET
                 * bit in the st_mode field for pipes.  Fix this then.
                 */
                 * Determine if input is a pipe.  4.4BSD will set the SOCKET
                 * bit in the st_mode field for pipes.  Fix this then.
                 */

-               if (lseek(fileno(fp), 0L, SEEK_CUR) == -1 && errno == ESPIPE) {
+               if (lseek(fileno(stdin), (off_t)0, SEEK_CUR) == -1 &&
+                   errno == ESPIPE) {

                        errno = 0;
                        fflag = 0;              /* POSIX.2 requires this. */
                }
 
                if (rflag)
                        errno = 0;
                        fflag = 0;              /* POSIX.2 requires this. */
                }
 
                if (rflag)

-                       reverse(fp, style, off, &sb);
+                       reverse(stdin, style, off, &sb);

                else
                else

-                       forward(fp, style, off, &sb);
+                       forward(stdin, style, off, &sb);

        }
        exit(rval);
 }
        }
        exit(rval);
 }


@@ -179,7 +212,7 @@ main(argc, argv)
  */
 static void
 obsolete(argv)
  */
 static void
 obsolete(argv)

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

 {
        register char *ap, *p, *t;
        int len;
 {
        register char *ap, *p, *t;
        int len;


@@ -264,6 +297,6 @@ static void
 usage()
 {
        (void)fprintf(stderr,
 usage()
 {
        (void)fprintf(stderr,

-           "usage: tail [-f | -r] [-b # | -c # | -n #] [file]\n");
+           "usage: tail [-f | -r] [-b # | -c # | -n #] [file ...]\n");

        exit(1);
 }
        exit(1);
 }