CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-08-17 09:06:50 +02:00
Code Issues Projects Releases Wiki Activity

(recheck): Factor out a block of duplicated code.

Browse Source 
Set f->size to 0 upon encountering a new file so we read it from
the beginning rather than from then end of the first line or
block.  Otherwise, after a log rotation, tail would omit the first
line or block of the new file.  Reported by Ed Avis.
This commit is contained in:
Jim Meyering
1999-03-25 14:29:13 +00:00
parent 11212212b0
commit 562f29a2a2
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tail.c
+17 -18
View File
@@ -629,6 +629,7 @@ recheck (struct File_spec *f)
int fail = 0;
int is_stdin = (STREQ (f->name, "-"));
int was_missing = f->missing;
int new_file;
fd = (is_stdin ? STDIN_FILENO : open (f->name, O_RDONLY));
@@ -663,6 +664,7 @@ cannot follow end of non-regular file"),
pretty_name (f));
}
new_file = 0;
if (fail)
{
close_fd (fd, pretty_name (f));
@@ -671,6 +673,7 @@ cannot follow end of non-regular file"),
}
else if (f->ino != new_stats.st_ino || f->dev != new_stats.st_dev)
{
new_file = 1;
if (f->fd == -1)
{
error (0, 0,
@@ -688,34 +691,30 @@ cannot follow end of non-regular file"),
_("`%s' has been replaced; following end of new file"),
pretty_name (f));
}
f->fd = fd;
f->size = new_stats.st_size;
f->dev = new_stats.st_dev;
f->ino = new_stats.st_ino;
f->n_unchanged_stats = 0;
f->n_consecutive_size_changes = 0;
/* FIXME: check lseek return value */
lseek (f->fd, new_stats.st_size, SEEK_SET);
}
else if (f->missing)
{
new_file = 1;
error (0, 0, _("`%s' has reappeared"), pretty_name (f));
f->missing = 0;
f->fd = fd;
f->size = new_stats.st_size;
f->dev = new_stats.st_dev;
f->ino = new_stats.st_ino;
f->n_unchanged_stats = 0;
f->n_consecutive_size_changes = 0;
/* FIXME: check lseek return value */
lseek (f->fd, new_stats.st_size, SEEK_SET);
}
else
{
close_fd (fd, pretty_name (f));
}
if (new_file)
{
/* Record new file info in f. */
f->fd = fd;
f->size = 0; /* Start at the beginning of the file... */
f->dev = new_stats.st_dev;
f->ino = new_stats.st_ino;
f->n_unchanged_stats = 0;
f->n_consecutive_size_changes = 0;
/* FIXME: check lseek return value */
lseek (f->fd, f->size, SEEK_SET);
}
}
/* FIXME: describe */