[Midnightbsd-cvs] src: usr.bin/ktrace: sync ktrace

[laffer1 at midnightbsd.org]

Log Message:
-----------
sync ktrace

Modified Files:
--------------
    src/usr.bin/ktrace:
        ktrace.1 (r1.1.1.1 -> r1.2)
        ktrace.c (r1.2 -> r1.3)

-------------- next part --------------
Index: ktrace.c
===================================================================
RCS file: /home/cvs/src/usr.bin/ktrace/ktrace.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.bin/ktrace/ktrace.c -L usr.bin/ktrace/ktrace.c -u -r1.2 -r1.3
--- usr.bin/ktrace/ktrace.c
+++ usr.bin/ktrace/ktrace.c
@@ -44,7 +44,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/ktrace/ktrace.c,v 1.20.12.1 2006/03/20 14:25:19 rwatson Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/ktrace/ktrace.c,v 1.22 2007/02/13 00:22:29 mpp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -123,7 +123,7 @@
 	argv += optind;
 	argc -= optind;
 	
-	if ((pidset && *argv) || (!pidset && !*argv))
+	if ((pidset && *argv) || (!pidset && clear == NOTSET && !*argv))
 		usage();
 			
 	if (inherit)
Index: ktrace.1
===================================================================
RCS file: /home/cvs/src/usr.bin/ktrace/ktrace.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/ktrace/ktrace.1 -L usr.bin/ktrace/ktrace.1 -u -r1.1.1.1 -r1.2
--- usr.bin/ktrace/ktrace.1
+++ usr.bin/ktrace/ktrace.1
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/ktrace/ktrace.1,v 1.17 2005/01/18 13:43:50 ru Exp $
+.\" $FreeBSD: src/usr.bin/ktrace/ktrace.1,v 1.18 2006/11/06 15:17:50 trhodes Exp $
 .\"
-.Dd June 6, 1993
+.Dd November 6, 2006
 .Dt KTRACE 1
 .Os
 .Sh NAME
@@ -64,7 +64,7 @@
 A traced process can generate enormous amounts of log data quickly;
 It is strongly suggested that users memorize how to disable tracing before
 attempting to trace a process.
-The following command is sufficient to disable tracing on all user owned
+The following command is sufficient to disable tracing on all user-owned
 processes, and, if executed by root, all processes:
 .Pp
 .Dl \&$ ktrace -C
@@ -73,12 +73,16 @@
 .Xr kdump 1
 to decode it.
 .Pp
-The options are as follows:
+The utility may be used only with a kernel that has been built with the
+.Dq KTRACE
+option in the kernel configuration file.
+.Pp
+The options are:
 .Bl -tag -width indent
 .It Fl a
 Append to the trace file instead of recreating it.
 .It Fl C
-Disable tracing on all user owned processes, and, if executed by root, all
+Disable tracing on all user-owned processes, and, if executed by root, all
 processes in the system.
 .It Fl c
 Clear the trace points associated with the specified file or processes.
@@ -160,7 +164,7 @@
 # disable all tracing to the file "tracedata"
 .Dl $ ktrace -c -f tracedata
 .Pp
-# disable tracing of all processes owned by the user
+# disable tracing of all user-owned processes
 .Dl $ ktrace -C
 .Sh SEE ALSO
 .Xr kdump 1