summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inotail.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/inotail.c b/inotail.c
index 2790005..967a0fa 100644
--- a/inotail.c
+++ b/inotail.c
@@ -379,20 +379,15 @@ static int watch_files(struct file_struct *files, int n_files)
ssize_t len;
int ev_idx = 0;
- /* Keep trying in the case of EINTR or EAGAIN*/
- for (;;) {
- 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 */
- if (errno == EINTR || errno == EAGAIN)
- continue;
- else {
- fprintf(stderr, "Error: Could not read inotify events (%s)\n", strerror(errno));
- exit(EXIT_FAILURE);
- }
+ 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 */
+ if (errno == EINTR || errno == EAGAIN)
+ continue; /* Keep trying */
+ else {
+ fprintf(stderr, "Error: Could not read inotify events (%s)\n", strerror(errno));
+ exit(EXIT_FAILURE);
}
- /* The read did succeed */
- break;
}
while (ev_idx < len) {