Changeset 372 for trunk/src/sh_inotify.c

Timestamp:

Nov 1, 2011, 12:33:37 AM (13 years ago)

Author:

katerina

Message:

One more patch for ticket #265 (inotify). Handle dirs that are only specified as files.

File:

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

trunk/src/sh_inotify.c

@@ -125 +125 @@
 {
   int    watch;
-  int    flag;
+  short  flag;
+  short  type;
   int    class;
   unsigned long check_mask;
@@ -355 +356 @@
 
 char * sh_inotify_pop_dormant(sh_watches * watches, 
-                              int * class, unsigned long * check_mask)
+                              int * class, unsigned long * check_mask, int * type)
 {
   char * popret = NULL;
@@ -372 +373 @@
     {
       *class = this->watch->class;
+      *type  = this->watch->type;
       *check_mask = this->watch->check_mask;
       popret = sh_util_strdup(this->watch->file);
@@ -472 +474 @@
 int sh_inotify_add_watch_later(char * filename, sh_watches * watches, 
                                int * errnum,
-                               int class, unsigned long check_mask)
+                               int class, unsigned long check_mask, int type)
 {
   sh_watch   * item;
@@ -479 +481 @@
 
   item->class      = class;
+  item->type       = (short) type;
   item->check_mask = check_mask;
 
@@ -571 +574 @@
  */
 int sh_inotify_add_watch(char * filename, sh_watches * watches, int * errnum,
-                         int class, unsigned long check_mask)
+                         int class, unsigned long check_mask, int type)
 {
   volatile int retval = 0;
@@ -614 +617 @@
 
           item->class      = class;
+          item->type       = type;
           item->check_mask = check_mask;
           
@@ -651 +655 @@
 
 char * sh_inotify_search_item(sh_watches * watches, int watch, 
-                              int * class, unsigned long * check_mask)
+                              int * class, unsigned long * check_mask, int * type)
 {
   sh_watch * item;
@@ -668 +672 @@
       *class      = item->class;
       *check_mask = item->check_mask;
+      *type       = item->type;
       sret = sh_util_strdup(item->file);
     }
@@ -705 +710 @@
       if (filename)
         {
-          if (sh_inotify_add_watch(filename, watches, errnum, 0, 0) < 0)
+          if (sh_inotify_add_watch(filename, watches, errnum, 0, 0, SH_INOTIFY_FILE) < 0)
             {
               retry_msleep(waitsec, 0);