Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/inotifyd.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/miscutils/inotifyd.c (modified) (3 diffs)

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

@@ -48 +48 @@
 //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    y   Subfile is moved into dir"
+//usage:     "\n    m   Subfile is moved out of dir"
 //usage:     "\n    n   Subfile is created"
 //usage:     "\n    d   Subfile is deleted"
@@ -57 +57 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <sys/inotify.h>
 
@@ -162 +163 @@
         // read out all pending events
         // (NB: len must be int, not ssize_t or long!)
+#define eventbuf bb_common_bufsiz1
+        setup_common_bufsiz();
         xioctl(pfd.fd, FIONREAD, &len);
-#define eventbuf bb_common_bufsiz1
-        ie = buf = (len <= sizeof(eventbuf)) ? eventbuf : xmalloc(len);
+        ie = buf = (len <= COMMON_BUFSIZE) ? eventbuf : xmalloc(len);
         len = full_read(pfd.fd, buf, len);
         // process events. N.B. events may vary in length