Attachment 50551 Details for Bug 118246

[patch] Fix bugs 117308 and 118246.

gamin-fix-117308-and-118246-1.patch (text/plain), 1.59 KB, created by Robert Love on 2005-09-21 18:16:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Love

Created: 2005-09-21 18:16:32 UTC

Size: 1.59 KB

patch

obsolete

> server/gam_connection.c |    7 +++++++
> server/gam_listener.c   |    7 +++++++
> 2 files changed, 14 insertions(+)
>
>diff -urN gamin-0.1.5/server/gam_connection.c gamin/server/gam_connection.c
>--- gamin-0.1.5/server/gam_connection.c	2005-08-05 18:31:46.000000000 -0400
>+++ gamin/server/gam_connection.c	2005-09-21 14:10:57.000000000 -0400
>@@ -15,6 +15,9 @@
> #ifdef GAMIN_DEBUG_API
> #include "gam_debugging.h"
> #endif
>+#ifdef ENABLE_INOTIFY
>+#include "gam_inotify.h"
>+#endif
> #include "fam.h"
> 
> /************************************************************************
>@@ -383,6 +386,10 @@
> 
> 	    gam_listener_remove_subscription(conn->listener, sub);
> 	    gam_remove_subscription(sub);
>+#ifdef ENABLE_INOTIFY
>+	    if ((gam_inotify_is_running()) && (!gam_exclude_check(path)))
>+		gam_subscription_free(sub);
>+#endif
> 
> 	    if (gam_send_ack(conn, req->seq, path, pathlen) < 0) {
> 		GAM_DEBUG(DEBUG_INFO, "Failed to send cancel ack to PID %d\n",
>diff -urN gamin-0.1.5/server/gam_listener.c gamin/server/gam_listener.c
>--- gamin-0.1.5/server/gam_listener.c	2005-08-01 17:04:50.000000000 -0400
>+++ gamin/server/gam_listener.c	2005-09-21 14:10:57.000000000 -0400
>@@ -25,6 +25,9 @@
> #include "gam_server.h"
> #include "gam_error.h"
> #include "gam_pidname.h"
>+#ifdef ENABLE_INOTIFY
>+#include "gam_inotify.h"
>+#endif
> 
> // #define GAM_LISTENER_VERBOSE
> /* private struct representing a single listener */
>@@ -90,6 +93,10 @@
>     g_assert(sub);
>     g_assert(g_list_find(listener->subs, sub));
>     gam_remove_subscription(sub);
>+#ifdef ENABLE_INOTIFY
>+    if (gam_inotify_is_running())
>+	gam_subscription_free(sub);
>+#endif
> }
> 
> /**

Actions: View | Diff

Attachments on bug 118246: 50550 | 50551