tail -F: don't stop following the target of a rename

This fixes a bug whereby tail -F would fail to track changes
to a file that was a target of a rename, and when the source of
the rename was another tailed file.

* src/tail.c (tail_forever_inotify): Ensure the wd is not already
present in the hash table before trying to add it.  When a new watch
descriptor is added to the `wd_to_name' hash table, check that it is
not already present.  If it is present then remove the previous element.
This commit is contained in:
Giuseppe Scrivano authored and Jim Meyering committed 2009-12-30 11:22:55 +01:00
1 parent 2024418dc4
commit 2ead2365e0
1 file changed
+14 -1
+14 -1
View File
@@ -1486,11 +1486,24 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
/* Remove `fspec' and re-add it using `new_fd' as its key. */
hash_delete (wd_to_name, fspec);
fspec->wd = new_wd;
/* If the file was moved then inotify will use the source file wd for
the destination file. Make sure the key is not present in the
table. */
struct File_spec *prev = hash_delete (wd_to_name, fspec);
if (prev && prev != fspec)
{
if (follow_mode == Follow_name)
recheck (prev, false);
prev->wd = -1;
close_fd (prev->fd, pretty_name (prev));
}
if (hash_insert (wd_to_name, fspec) == NULL)
xalloc_die ();
if (follow_mode == Follow_name)
recheck (&(f[j]), false);
recheck (fspec, false);
}
else
{