Changeset 372 for trunk/src/sh_files.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_files.c (modified) (3 diffs)

trunk/src/sh_files.c

@@ -370 +370 @@
             {
               sh_inotify_add_watch_later(ptr->name, &sh_file_watches, NULL,
-                                         ptr->class, ptr->check_mask);
+                                         ptr->class, ptr->check_mask, SH_INOTIFY_FILE);
             }
 
@@ -1907 +1907 @@
     }
 
-  if ((sh.flag.inotify & SH_INOTIFY_DOSCAN) != 0)
-    {
-      sh_inotify_add_watch_later(iname, &sh_file_watches, &status,
-                                 iclass, check_mask);
-    }
-   
   /* ---- stat the directory ----
    */
@@ -1955 +1949 @@
     }
 
+  if ((sh.flag.inotify & SH_INOTIFY_DOSCAN) != 0)
+    {
+      sh_inotify_add_watch_later(iname, &sh_file_watches, &status,
+                                 iclass, check_mask, SH_INOTIFY_DIR);
+    }
+   
   hardlink_num = theFile->hardlinks;