From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 12 Aug 2009 18:01:56 +0000 (+0100)
Subject: tail: fix tail -f failure when inotify used
X-Git-Tag: v7.5~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f43f02865253e1cca210cc588269f5acf755259f;p=thirdparty%2Fcoreutils.git

tail: fix tail -f failure when inotify used

* src/tail.c (tail_forever_inotify): Remove the redundant and
incorrect error check of the return from inotify_add_watch().
Also initialize the wd member of each File_spec to an invalid value.
Reported by C de-Avillez.
---

diff --git a/src/tail.c b/src/tail.c
index 3c8f425caa..6f83706258 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -1193,7 +1193,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
           if (evlen < fnlen)
             evlen = fnlen;
 
-          f[i].wd = 0;
+          f[i].wd = -1;
 
           if (follow_mode == Follow_name)
             {
@@ -1231,8 +1231,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
           if (hash_insert (wd_table, &(f[i])) == NULL)
             xalloc_die ();
 
-          if (follow_mode == Follow_name || f[i].wd)
-            found_watchable = true;
+          found_watchable = true;
         }
     }