svn commit: trunk/busybox/miscutils

[vda at busybox.net]

Author: vda
Date: 2008-11-29 01:07:24 -0800 (Sat, 29 Nov 2008)
New Revision: 24181

Log:
inotifyd: save resourses by closing unused inotify descriptors



Modified:
   trunk/busybox/miscutils/inotifyd.c


Changeset:
Modified: trunk/busybox/miscutils/inotifyd.c
===================================================================
--- trunk/busybox/miscutils/inotifyd.c	2008-11-29 09:05:50 UTC (rev 24180)
+++ trunk/busybox/miscutils/inotifyd.c	2008-11-29 09:07:24 UTC (rev 24181)
@@ -53,9 +53,6 @@
 	MASK_BITS = sizeof(mask_names) - 1
 };
 
-extern int inotify_init(void);
-extern int inotify_add_watch(int fd, const char *path, uint32_t mask);
-
 int inotifyd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int inotifyd_main(int argc, char **argv)
 {
@@ -160,9 +157,11 @@
 				args[3] = ie->len ? ie->name : NULL;
 				wait4pid(xspawn((char **)args));
 				// we are done if all files got final x event
-				if (ie->mask & 0x8000)
+				if (ie->mask & 0x8000) {
 					if (--argc <= 0)
 						goto done;
+					inotify_rm_watch(pfd.fd, ie->wd);
+				}
 			}
 			// next event
 			i = sizeof(struct inotify_event) + ie->len;