Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/miscutils/inotifyd.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/miscutils/inotifyd.c (modified) (2 diffs)

branches/3.2/mindi-busybox/miscutils/inotifyd.c

@@ -27 +27 @@
  * See below for mask names explanation.
  */
+
+//usage:#define inotifyd_trivial_usage
+//usage:    "PROG FILE1[:MASK]..."
+//usage:#define inotifyd_full_usage "\n\n"
+//usage:       "Run PROG on filesystem changes."
+//usage:     "\nWhen a filesystem event matching MASK occurs on FILEn,"
+//usage:     "\nPROG ACTUAL_EVENTS FILEn [SUBFILE] is run."
+//usage:     "\nIf PROG is -, events are sent to stdout."
+//usage:     "\nEvents:"
+//usage:     "\n    a   File is accessed"
+//usage:     "\n    c   File is modified"
+//usage:     "\n    e   Metadata changed"
+//usage:     "\n    w   Writable file is closed"
+//usage:     "\n    0   Unwritable file is closed"
+//usage:     "\n    r   File is opened"
+//usage:     "\n    D   File is deleted"
+//usage:     "\n    M   File is moved"
+//usage:     "\n    u   Backing fs is unmounted"
+//usage:     "\n    o   Event queue overflowed"
+//usage:     "\n    x   File can't be watched anymore"
+//usage:     "\nIf watching a directory:"
+//usage:     "\n    m   Subfile is moved into dir"
+//usage:     "\n    y   Subfile is moved out of dir"
+//usage:     "\n    n   Subfile is created"
+//usage:     "\n    d   Subfile is deleted"
+//usage:     "\n"
+//usage:     "\ninotifyd waits for PROG to exit."
+//usage:     "\nWhen x event happens for all FILEs, inotifyd exits."
 
 #include "libbb.h"
@@ -151 +179 @@
                 }
                 *s = '\0';
-//              bb_error_msg("exec %s %08X\t%s\t%s\t%s", args[0],
-//                  ie->mask, events, watches[ie->wd], ie->len ? ie->name : "");
-                args[1] = events;
-                args[2] = watches[ie->wd];
-                args[3] = ie->len ? ie->name : NULL;
-                spawn_and_wait((char **)args);
+                if (LONE_CHAR(args[0], '-')) {
+                    /* "inotifyd - FILE": built-in echo */
+                    printf(ie->len ? "%s\t%s\t%s\n" : "%s\t%s\n", events,
+                            watches[ie->wd],
+                            ie->name);
+                    fflush(stdout);
+                } else {
+//                  bb_error_msg("exec %s %08X\t%s\t%s\t%s", args[0],
+//                      ie->mask, events, watches[ie->wd], ie->len ? ie->name : "");
+                    args[1] = events;
+                    args[2] = watches[ie->wd];
+                    args[3] = ie->len ? ie->name : NULL;
+                    spawn_and_wait((char **)args);
+                }
                 // we are done if all files got final x event
                 if (ie->mask & 0x8000) {