summaryrefslogtreecommitdiff
path: root/src/tail.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tail.c')
-rw-r--r--src/tail.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tail.c b/src/tail.c
index 29ddabd6..ca851ee6 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -1,5 +1,5 @@
/* tail -- output the last part of file(s)
- Copyright (C) 1989-2012 Free Software Foundation, Inc.
+ Copyright (C) 1989-2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -263,11 +263,10 @@ Usage: %s [OPTION]... [FILE]...\n\
Print the last %d lines of each FILE to standard output.\n\
With more than one FILE, precede each with a header giving the file name.\n\
With no FILE, or when FILE is -, read standard input.\n\
-\n\
"), DEFAULT_N_LINES);
- fputs (_("\
-Mandatory arguments to long options are mandatory for short options too.\n\
-"), stdout);
+
+ emit_mandatory_arg_note ();
+
fputs (_("\
-c, --bytes=K output the last K bytes; alternatively, use -c +K\n\
to output bytes starting with the Kth of each file\n\
@@ -1141,6 +1140,7 @@ tail_forever (struct File_spec *f, size_t n_files, double sleep_interval)
f[i].fd = -1;
f[i].errnum = errno;
error (0, errno, "%s", name);
+ close (fd); /* ignore failure */
continue;
}
@@ -1276,9 +1276,9 @@ check_fspec (struct File_spec *fspec, int wd, int *prev_wd)
if (fstat (fspec->fd, &stats) != 0)
{
+ fspec->errnum = errno;
close_fd (fspec->fd, name);
fspec->fd = -1;
- fspec->errnum = errno;
return;
}