svn commit: trunk/busybox: include miscutils

[vda at busybox.net]

Author: vda
Date: 2008-11-14 13:52:16 -0800 (Fri, 14 Nov 2008)
New Revision: 24045

Log:
inotify: document waiting behavior



Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/miscutils/inotifyd.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2008-11-14 21:34:13 UTC (rev 24044)
+++ trunk/busybox/include/usage.h	2008-11-14 21:52:16 UTC (rev 24045)
@@ -1840,14 +1840,15 @@
 #define inotifyd_trivial_usage \
 	"/user/space/agent dir/or/file/being/watched[:mask] ..."
 #define inotifyd_full_usage "\n\n" \
-       "Spawn userspace agent on filesystem changes." \
+       "Run userspace agent on filesystem changes." \
      "\nWhen a filesystem event matching the mask occurs" \
-     "\non specified file/directory an userspace agent is spawned" \
+     "\non specified file /user/space/agent is run" \
      "\nwith the parameters:" \
      "\n1. actual event(s)" \
-     "\n2. file/directory name" \
+     "\n2. file name" \
      "\n3. name of subfile (if any), in case of watching a directory" \
-     "\n" \
+     "\ninotify waits for agent to exit." \
+     "\nEvents:" \
      "\n	a	File is accessed" \
      "\n	c	File is modified" \
      "\n	e	Metadata changed" \

Modified: trunk/busybox/miscutils/inotifyd.c
===================================================================
--- trunk/busybox/miscutils/inotifyd.c	2008-11-14 21:34:13 UTC (rev 24044)
+++ trunk/busybox/miscutils/inotifyd.c	2008-11-14 21:52:16 UTC (rev 24045)
@@ -103,7 +103,7 @@
 		if (bb_got_signal)
 			break;
 		n = poll(&pfd, 1, -1);
-		/* Signal interrupted us? */
+		// Signal interrupted us?
 		if (n < 0 && errno == EINTR)
 			goto again;
 		// Under Linux, above if() is not necessary.