Changeset 371 for trunk/src/sh_inotify.c

Timestamp:

Oct 31, 2011, 9:42:22 PM (13 years ago)

Author:

katerina

Message:

Patch for ticket #265 (inotify support).

File:

• trunk/src/sh_inotify.c (modified) (6 diffs)

trunk/src/sh_inotify.c

@@ -213 +213 @@
 ssize_t sh_inotify_read(char * buffer, size_t count)
 {
+  ssize_t len = -1;
+  int     ifd = sh_inotify_getfd();
+
+  do {
+    len = read (ifd, buffer, count);
+  } while (len < 0 && (errno == EINTR || errno == EAGAIN));
+
+  return len;
+}
+
+ssize_t sh_inotify_read_timeout(char * buffer, size_t count, int timeout)
+{
   ssize_t len;
   int     ifd = sh_inotify_getfd();
 
-  do {
-    len = read (ifd, buffer, count);
-  } while (len < 0 || errno == EINTR);
+  len = sl_read_timeout_fd (ifd, buffer, count, timeout, SL_FALSE);
 
   return len;
 }
+
 
 static void sh_inotify_free_watch(void * item)
@@ -287 +298 @@
     {
       listcursor->curnode = listcursor->curnode->next;
-      return listcursor->curnode->watch;
+      if (listcursor->curnode)
+        return listcursor->curnode->watch;
+      else
+        return NULL;
     }
 
@@ -512 +526 @@
   int ifd = sh_get_inotify_fd();
 
-  extern void sh_fInotify_report_add(char * path, int class, unsigned long check_mask);
+  extern void sh_fInotify_report_add(char * path, 
+                                     int class, unsigned long check_mask);
 
   sh_dummy_litem = (void*) &litem;
@@ -520 +535 @@
   SH_MUTEX_LOCK(mutex_list_dormant);
   
-  for (litem = sh_inotify_list_first(&listcursor, save); litem;
-       litem = sh_inotify_list_next(&listcursor, save))
+  litem = sh_inotify_list_first(&listcursor, save);
+
+  while (litem)
     {
     have_next:
@@ -545 +561 @@
             }
         }
+      litem = sh_inotify_list_next(&listcursor, save);
     }
   SH_MUTEX_UNLOCK(mutex_list_dormant);
@@ -725 +742 @@
       /* -- Blocking read on inotify file descriptor
        */
-      sh_inotify_read(buffer, sizeof(buffer));
+      len = sh_inotify_read(buffer, sizeof(buffer));
 
       if (len > 0)