summaryrefslogtreecommitdiffstats
path: root/usr.bin/tail/tail.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/tail/tail.c')
-rw-r--r--usr.bin/tail/tail.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index aaa6b0c..d227874 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -34,32 +34,34 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1991, 1993\n\
The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
+#endif
#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93";
+static const char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
#include <sys/types.h>
#include <sys/stat.h>
+
+#include <err.h>
#include <errno.h>
-#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <err.h>
+#include <unistd.h>
+
#include "extern.h"
int Fflag, fflag, rflag, rval;
-char *fname;
+const char *fname;
static void obsolete __P((char **));
static void usage __P((void));
@@ -169,7 +171,7 @@ main(argc, argv)
}
if (*argv)
- for (first = 1; fname = *argv++;) {
+ for (first = 1; (fname = *argv++);) {
if ((fp = fopen(fname, "r")) == NULL ||
fstat(fileno(fp), &sb)) {
ierr();
@@ -227,7 +229,7 @@ obsolete(argv)
size_t len;
char *start;
- while (ap = *++argv) {
+ while ((ap = *++argv)) {
/* Return if "--" or not an option of any form. */
if (ap[0] != '-') {
if (ap[0] != '+')
OpenPOWER on IntegriCloud