Changeset 506 for trunk

Timestamp:

Jun 1, 2016, 8:52:37 PM (8 years ago)

Author:

katerina

Message:

Fix for ticket #401 (directory creation w/inotify).

File:

• trunk/src/sh_fInotify.c (modified) (5 diffs)

trunk/src/sh_fInotify.c

@@ -633 +633 @@
               retD = sh_files_search_dir(path, &classD, &check_flagsD, 
                                          &reportedD, &rdepthD);
+
               if (retD != 0)
                 {
-                  if (ret == 0)
+                  if (ret == 0) /* because checked as file below */
                     {
                       class      = classD;
@@ -641 +642 @@
                     }
                 }
+              rdepthD -= 1; if (rdepthD < -1) rdepthD = -1;
             }
           
@@ -650 +652 @@
             {
               SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_INSCAN;   );
+              /* Here we use classD because we check as directory now */
               sh_files_checkdir (classD, check_flagsD, rdepthD, 
                                  path, (event->len > 0) ? event->name : NULL);
@@ -657 +660 @@
               sh_files_reset ();
             }
-          
         }
       
@@ -665 +667 @@
       if ((ret != 0) || (event->mask & IN_ISDIR))
         {
+          int inotify_type = SH_INOTIFY_FILE;
+          
+          if ((event->mask & IN_ISDIR) && (rdepthD >= 0))
+            inotify_type = SH_INOTIFY_DIR;
+
           sh_inotify_add_watch(path, &sh_file_watches, &ret,
                                class, check_flags, 
-                               (event->mask & IN_ISDIR)?SH_INOTIFY_DIR:SH_INOTIFY_FILE, 
+                               inotify_type, 
                                rdepthD);
         }