summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2010-10-24 14:02:12 +0100
committerPádraig Brady <P@draigBrady.com>2010-10-25 15:41:53 +0100
commitc84ddbaa333fc502394941320d3abef2db6889f0 (patch)
tree9527232eb2c854b1670303fc3265b28e819567ae /src
parent7d93a082b6e3ece0b120a5150d2020c7fa11b2f5 (diff)
downloadcoreutils-c84ddbaa333fc502394941320d3abef2db6889f0.tar.xz
tail: support rechecking currently missing remote dirs
src/tail.c (main): As an optimization, don't bother checking for stdin or remote files, when ---disable-inotify is specified. To improve the fix in commit 61b77891, set the disable_inotify flag when we fall back to polling, so that we recheck remote files. NEWS: Mention the fix
Diffstat (limited to 'src')
-rw-r--r--src/tail.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tail.c b/src/tail.c
index 68cc819d6..924221016 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -2169,7 +2169,8 @@ main (int argc, char **argv)
FIXME: when using inotify, and a directory for a watched file
is recreated, then we don't recheck any new file when
follow_mode == Follow_name */
- if (tailable_stdin (F, n_files) || any_remote_file (F, n_files))
+ if (!disable_inotify && (tailable_stdin (F, n_files)
+ || any_remote_file (F, n_files)))
disable_inotify = true;
if (!disable_inotify)
@@ -2189,6 +2190,7 @@ main (int argc, char **argv)
error (0, errno, _("inotify cannot be used, reverting to polling"));
}
#endif
+ disable_inotify = true;
tail_forever (F, n_files, sleep_interval);
}