svn commit: r236620 - in head: share/man/man4 tools/regression/filemon

[David E. O'Brien]

Author: obrien
Date: Tue Jun  5 17:36:28 2012
New Revision: 236620
URL: http://svn.freebsd.org/changeset/base/236620

Log:
  Correct examples to the latest version I had.

Modified:
  head/share/man/man4/filemon.4
  head/tools/regression/filemon/filemontest.c

Modified: head/share/man/man4/filemon.4
==============================================================================
--- head/share/man/man4/filemon.4	Tue Jun  5 16:46:34 2012	(r236619)
+++ head/share/man/man4/filemon.4	Tue Jun  5 17:36:28 2012	(r236620)
@@ -127,18 +127,19 @@ open_filemon(void)
 	    O_CREAT | O_WRONLY | O_TRUNC, DEFFILEMODE)) == -1)
 		err(1, "open(filemon.out)");
 
-	if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) < 0)
+	if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) == -1)
 		err(1, "Cannot set filemon log file descriptor");
 	/* Set up these two fd's to close on exec. */
 	(void)fcntl(fm_fd, F_SETFD, FD_CLOEXEC);
 	(void)fcntl(fm_log, F_SETFD, FD_CLOEXEC);
 
 	if ((child = fork()) == 0) {
+		child = getpid();
+		if (ioctl(fm_fd, FILEMON_SET_PID, &child) == -1)
+			err(1, "Cannot set filemon PID");
 		/* Do something here. */
 		return 0;
 	} else {
-		if (ioctl(fm_fd, FILEMON_SET_PID, &child) < 0)
-			err(1, "Cannot set filemon PID");
 		wait(&child);
 		close(fm_fd);
 	}

Modified: head/tools/regression/filemon/filemontest.c
==============================================================================
--- head/tools/regression/filemon/filemontest.c	Tue Jun  5 16:46:34 2012	(r236619)
+++ head/tools/regression/filemon/filemontest.c	Tue Jun  5 17:36:28 2012	(r236620)
@@ -54,22 +54,27 @@ main(void) {
 	if ((fm_log = mkstemp(log_name)) == -1)
 		err(1, "mkstemp(%s)", log_name);
 
-	if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) < 0)
+	if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) == -1)
 		err(1, "Cannot set filemon log file descriptor");
 
 	/* Set up these two fd's to close on exec. */
 	(void)fcntl(fm_fd, F_SETFD, FD_CLOEXEC);
 	(void)fcntl(fm_log, F_SETFD, FD_CLOEXEC);
 
-	if ((child = fork()) == 0) {
+	switch (child = fork()) {
+	case 0:
+		child = getpid();
+		if (ioctl(fm_fd, FILEMON_SET_PID, &child) == -1)
+			err(1, "Cannot set filemon PID to %d", child);
 		system("./test_script.sh");
-		return 0;
-	} else {
-		if (ioctl(fm_fd, FILEMON_SET_PID, &child) < 0)
-			err(1, "Cannot set filemon PID");
+		break;
+	case -1:
+		err(1, "Cannot fork");
+	default:
 		wait(&child);
 		close(fm_fd);
 //		printf("Results in %s\n", log_name);
+		break;
 	}
 	return 0;
 }