From f76874b807f5595e54752ba4973eba1d57ff7621 Mon Sep 17 00:00:00 2001
From: Martin S
Date: Sat, 7 Apr 2012 21:09:01 +0200
Subject: libusbmuxd: Do not close inotify watch descriptor like a file
 descriptor

This caused stdout (fd 1) to be closed in certain situations which does not
happen any longer.
---
 libusbmuxd/libusbmuxd.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libusbmuxd/libusbmuxd.c b/libusbmuxd/libusbmuxd.c
index d9cbd71..6d4504b 100644
--- a/libusbmuxd/libusbmuxd.c
+++ b/libusbmuxd/libusbmuxd.c
@@ -411,7 +411,7 @@ static int usbmuxd_listen_poll()
 static int usbmuxd_listen_inotify()
 {
 	int inot_fd;
-	int watch_fd;
+	int watch_d;
 	int sfd;
 
 	sfd = connect_usbmuxd_socket();
@@ -426,9 +426,9 @@ static int usbmuxd_listen_inotify()
 	}
 
 	/* inotify is setup, listen for events that concern us */
-	watch_fd = inotify_add_watch (inot_fd, USBMUXD_DIRNAME, IN_CREATE);
-	if (watch_fd < 0) {
-		fprintf (stderr, "Failed to setup watch for socket dir\n");
+	watch_d = inotify_add_watch (inot_fd, USBMUXD_DIRNAME, IN_CREATE);
+	if (watch_d < 0) {
+		fprintf (stderr, "Failed to setup watch descriptor for socket dir\n");
 		close (inot_fd);
 		return -2;
 	}
@@ -457,7 +457,7 @@ static int usbmuxd_listen_inotify()
 	}
 
 end:
-	close(watch_fd);
+	inotify_rm_watch(inot_fd, watch_d);
 	close(inot_fd);
 
 	return sfd;
-- 
cgit v1.1-32-gdbae