Changeset 228 for branches/samba-3.2.x/source/smbd/notify_inotify.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/smbd/notify_inotify.c (modified) (4 diffs)

branches/samba-3.2.x/source/smbd/notify_inotify.c

@@ -26 +26 @@
 #ifdef HAVE_INOTIFY
 
+#if HAVE_SYS_INOTIFY_H
+#include <sys/inotify.h>
+#else
+
 #ifdef HAVE_ASM_TYPES_H
 #include <asm/types.h>
@@ -58 +62 @@
 
 #endif
-
+#endif
 
 /* older glibc headers don't have these defines either */
@@ -244 +248 @@
         if (e == NULL) return;
 
-        if (read(in->fd, e0, bufsize) != bufsize) {
+        if (sys_read(in->fd, e0, bufsize) != bufsize) {
                 DEBUG(0,("Failed to read all inotify data\n"));
                 talloc_free(e0);
@@ -251 +255 @@
 
         /* we can get more than one event in the buffer */
-        while (bufsize >= sizeof(*e)) {
+        while (e && (bufsize >= sizeof(*e))) {
                 struct inotify_event *e2 = NULL;
                 bufsize -= e->len + sizeof(*e);