s3: include smbd/smbd.h where needed.

[amitay/samba.git] / source3 / smbd / notify_inotify.c

diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index c6c12a9cd2d02dc82467aafd0de06f51fa37cf97..bccd093be4cee061177a44ecec9337810ca2cfbb 100644 (file)
--- a/source3/smbd/notify_inotify.c
+++ b/source3/smbd/notify_inotify.c
@@ -2,17 +2,17 @@
    Unix SMB/CIFS implementation.
 
    Copyright (C) Andrew Tridgell 2006
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -22,9 +22,15 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/notify.h"
+#include "smbd/smbd.h"
 
 #ifdef HAVE_INOTIFY
 
+#if HAVE_SYS_INOTIFY_H
+#include <sys/inotify.h>
+#else
+
 #ifdef HAVE_ASM_TYPES_H
 #include <asm/types.h>
 #endif
@@ -57,7 +63,7 @@ static int inotify_rm_watch(int fd, int wd)
 #include <sys/inotify.h>
 
 #endif
-
+#endif
 
 /* older glibc headers don't have these defines either */
 #ifndef IN_ONLYDIR
@@ -138,12 +144,12 @@ static bool filter_match(struct inotify_watch_context *w,
 
        return True;
 }
-       
+
 
 
 /*
   dispatch one inotify event
-  
+
   the cookies are used to correctly handle renames
 */
 static void inotify_dispatch(struct inotify_private *in, 
@@ -207,7 +213,7 @@ static void inotify_dispatch(struct inotify_private *in,
 
        ne.action = NOTIFY_ACTION_MODIFIED;
        e->mask = IN_ATTRIB;
-       
+
        for (w=in->watches;w;w=next) {
                next = w->next;
                if (w->wd == e->wd && filter_match(w, e) &&
@@ -228,6 +234,7 @@ static void inotify_handler(struct event_context *ev, struct fd_event *fde,
        int bufsize = 0;
        struct inotify_event *e0, *e;
        uint32_t prev_cookie=0;
+       NTSTATUS status;
 
        /*
          we must use FIONREAD as we cannot predict the length of the
@@ -237,15 +244,22 @@ static void inotify_handler(struct event_context *ev, struct fd_event *fde,
        if (ioctl(in->fd, FIONREAD, &bufsize) != 0 || 
            bufsize == 0) {
                DEBUG(0,("No data on inotify fd?!\n"));
+               TALLOC_FREE(fde);
                return;
        }
 
-       e0 = e = (struct inotify_event *)TALLOC_SIZE(in, bufsize);
+       e0 = e = (struct inotify_event *)TALLOC_SIZE(in, bufsize + 1);
        if (e == NULL) return;
+       ((uint8_t *)e)[bufsize] = '\0';
 
-       if (sys_read(in->fd, e0, bufsize) != bufsize) {
-               DEBUG(0,("Failed to read all inotify data\n"));
+       status = read_data(in->fd, (char *)e0, bufsize);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Failed to read all inotify data - %s\n",
+                       nt_errstr(status)));
                talloc_free(e0);
+               /* the inotify fd will now be out of sync,
+                * can't keep reading data off it */
+               TALLOC_FREE(fde);
                return;
        }
 
@@ -292,7 +306,7 @@ static NTSTATUS inotify_setup(struct sys_notify_context *ctx)
 
        /* add a event waiting for the inotify fd to be readable */
        event_add_fd(ctx->ev, in, in->fd, EVENT_FD_READ, inotify_handler, in);
-       
+
        return NT_STATUS_OK;
 }
 
@@ -346,7 +360,7 @@ static int watch_destructor(struct inotify_watch_context *w)
                        DEBUG(1, ("inotify_rm_watch returned %s\n",
                                  strerror(errno)));
                }
-               
+
        }
        return 0;
 }
@@ -427,7 +441,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
 
        /* the caller frees the handle to stop watching */
        talloc_set_destructor(w, watch_destructor);
-       
+
        return NT_STATUS_OK;
 }