gnome-ask-password-agent: restore removed libnotify0.6 support

[elogind.git] / src / path.c

diff --git a/src/path.c b/src/path.c
index cc8b79ad3304a64ce53b5b0b661775d3e91636ba..f7878b56ae0cb9ca55d2f844219f8a9cce447847 100644 (file)
--- a/src/path.c
+++ b/src/path.c
@@ -189,7 +189,7 @@ static int path_watch_one(Path *p, PathSpec *s) {
         };
 
         bool exists = false;
-        char *k;
+        char *k, *slash;
         int r;
 
         assert(p);
@@ -213,23 +213,23 @@ static int path_watch_one(Path *p, PathSpec *s) {
         if ((s->primary_wd = inotify_add_watch(s->inotify_fd, k, flags_table[s->type])) >= 0)
                 exists = true;
 
-        for (;;) {
+        do {
                 int flags;
-                char *slash;
 
                 /* This assumes the path was passed through path_kill_slashes()! */
                 if (!(slash = strrchr(k, '/')))
                         break;
 
-                *slash = 0;
+                /* Trim the path at the last slash. Keep the slash if it's the root dir. */
+                slash[slash == k] = 0;
 
-                flags = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB;
+                flags = IN_MOVE_SELF;
                 if (!exists)
-                        flags |= IN_CREATE | IN_MOVED_TO;
+                        flags |= IN_DELETE_SELF | IN_ATTRIB | IN_CREATE | IN_MOVED_TO;
 
                 if (inotify_add_watch(s->inotify_fd, k, flags) >= 0)
                         exists = true;
-        }
+        } while (slash != k);
 
         return 0;
 
@@ -279,10 +279,10 @@ static void path_set_state(Path *p, PathState state) {
                           path_state_to_string(old_state),
                           path_state_to_string(state));
 
-        unit_notify(UNIT(p), state_translation_table[old_state], state_translation_table[state]);
+        unit_notify(UNIT(p), state_translation_table[old_state], state_translation_table[state], true);
 }
 
-static void path_enter_waiting(Path *p, bool initial, bool recheck);
+static void path_enter_waiting(Path *p, bool initial, bool recheck, bool skip_watch);
 
 static int path_coldplug(Unit *u) {
         Path *p = PATH(u);
@@ -294,7 +294,7 @@ static int path_coldplug(Unit *u) {
 
                 if (p->deserialized_state == PATH_WAITING ||
                     p->deserialized_state == PATH_RUNNING)
-                        path_enter_waiting(p, true, true);
+                        path_enter_waiting(p, true, true, false);
                 else
                         path_set_state(p, p->deserialized_state);
         }
@@ -341,7 +341,7 @@ fail:
 }
 
 
-static void path_enter_waiting(Path *p, bool initial, bool recheck) {
+static void path_enter_waiting(Path *p, bool initial, bool recheck, bool skip_watch) {
         PathSpec *s;
         int r;
         bool good = false;
@@ -383,13 +383,22 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) {
         }
 
         if (good) {
+                log_debug("%s got triggered.", p->meta.id);
                 path_enter_running(p);
                 return;
         }
 
 waiting:
-        if ((r = path_watch(p)) < 0)
-                goto fail;
+        if (!skip_watch) {
+                if ((r = path_watch(p)) < 0)
+                        goto fail;
+
+                /* Hmm, so now we have created inotify watches, but the file
+                 * might have appeared/been removed by now, so we must
+                 * recheck */
+                path_enter_waiting(p, false, true, true);
+                return;
+        }
 
         path_set_state(p, PATH_WAITING);
         return;
@@ -409,7 +418,7 @@ static int path_start(Unit *u) {
                 return -ENOENT;
 
         p->failure = false;
-        path_enter_waiting(p, true, true);
+        path_enter_waiting(p, true, true, false);
 
         return 0;
 }
@@ -485,7 +494,7 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
             p->state != PATH_RUNNING)
                 return;
 
-        log_debug("inotify wakeup on %s.", u->meta.id);
+        /* log_debug("inotify wakeup on %s.", u->meta.id); */
 
         if (events != EPOLLIN) {
                 log_error("Got Invalid poll event on inotify.");
@@ -540,7 +549,7 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
         if (changed)
                 path_enter_running(p);
         else
-                path_enter_waiting(p, false, true);
+                path_enter_waiting(p, false, true, false);
 
         free(buf);
 
@@ -589,7 +598,7 @@ void path_unit_notify(Unit *u, UnitActiveState new_state) {
                         /* Hmm, so inotify was triggered since the
                          * last activation, so I guess we need to
                          * recheck what is going on. */
-                        path_enter_waiting(p, false, p->inotify_triggered);
+                        path_enter_waiting(p, false, p->inotify_triggered, false);
                 }
         }