summaryrefslogtreecommitdiff
path: root/inotail.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2007-06-17 11:44:38 +0200
committerTobias Klauser <tklauser@xenon.tklauser.home>2007-06-17 11:44:38 +0200
commit0cd9dee6d903651bdea1d95bbace8a45b3cdaf3a (patch)
tree40088874deec47b1899229050827fb546035bddb /inotail.c
parent2d130ba3ed8decf9b39f6008da0d9ffaa43bc062 (diff)
parent68d456507035555516a5b586303ea166ac9b5c40 (diff)
Merge branch 'master' into buffersize
Conflicts: inotail.c
Diffstat (limited to 'inotail.c')
-rw-r--r--inotail.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/inotail.c b/inotail.c
index f447467..069762b 100644
--- a/inotail.c
+++ b/inotail.c
@@ -414,9 +414,9 @@ static int watch_files(struct file_struct *files, int n_files)
len = read(ifd, buf, (n_files * INOTIFY_BUFLEN));
if (unlikely(len < 0)) {
- /* Some form of signal, likely ^Z/fg's STOP and CONT interrupted the inotify read, retry */
+ /* Some signal, likely ^Z/fg's STOP and CONT interrupted the inotify read, retry */
if (errno == EINTR || errno == EAGAIN)
- continue; /* Keep trying */
+ continue;
else {
fprintf(stderr, "Error: Could not read inotify events (%s)\n", strerror(errno));
exit(EXIT_FAILURE);
odesNick Piggin1-1/+8 2010-10-25fs: do not assign default i_ino in new_inodeChristoph Hellwig1-0/+1 2010-08-09convert remaining ->clear_inode() to ->evict_inode()Al Viro1-3/+5