diff options
| author | dteske <dteske@FreeBSD.org> | 2018-05-30 18:27:48 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2018-05-30 18:27:48 +0000 |
| commit | 2330477597aab408fddf0694f764ba475156d9f5 (patch) | |
| tree | e5cc9b4e08e9fe97539bf43df9fdee81b39204d8 | |
| parent | a1fc47fae0570380d20d943e3cd3ab49481d3547 (diff) | |
| download | FreeBSD-src-2330477597aab408fddf0694f764ba475156d9f5.zip FreeBSD-src-2330477597aab408fddf0694f764ba475156d9f5.tar.gz | |
MFC SVN r334261-334262,334359: dwatch(1) touch-ups
r334261: Guard against error when given -t "*..."
r334262: Eliminate ANSI dimming in developer mode
r334359: Fix "-t test" for post-processing profiles
Bump FreeBSD_version directly in stable/11 for ports IGNORE (as in r334290)
Reviewed by: gjb
Approved by: re (gjb)
Sponsored by: Smule, Inc.
| -rwxr-xr-x | cddl/usr.sbin/dwatch/dwatch | 12 | ||||
| -rw-r--r-- | sys/sys/param.h | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/cddl/usr.sbin/dwatch/dwatch b/cddl/usr.sbin/dwatch/dwatch index 05fe592..8d90d81 100755 --- a/cddl/usr.sbin/dwatch/dwatch +++ b/cddl/usr.sbin/dwatch/dwatch @@ -47,7 +47,7 @@ DTRACE_PRAGMA=" ############################################################ GLOBALS -VERSION='$Version: 1.2 $' # -V +VERSION='$Version: 1.4 $' # -V pgm="${0##*/}" # Program basename @@ -576,8 +576,8 @@ load_profile() ARGV="$ARGV -z '$( shell_escape "$EXECREGEX" )'" [ "$CUSTOM_DETAILS" ] && ARGV="$ARGV -E '$( shell_escape "$EVENT_DETAILS" )'" - [ "$EVENT_TEST" ] && - ARGV="$ARGV -t '$( shell_escape "$EVENT_TEST" )'" + [ "$CUSTOM_TEST" ] && + ARGV="$ARGV -t '$( shell_escape "$CUSTOM_TEST" )'" [ "$OUTPUT" ] && ARGV="$ARGV -o '$( shell_escape "$OUTPUT" )'" [ "$OUTPUT_CMD" ] && @@ -1057,10 +1057,6 @@ PSARGS_ACTION=$( cat <&9 ) slen = length(sprintf("%u", start)) elen = length(sprintf("%u", end)) N = elen > slen ? elen : slen - for (i = start; i <= end; i++) { - ti[i] = "\033[2m" - te[i] = "\033[22m" - } ti[line] = "\033[31m" te[line] = "\033[39m" fmt = "%s%*u %s%s\n" @@ -1353,7 +1349,7 @@ $ACTIONS } /*********************************************************/ -$PROBE${EVENT_TEST:+ /$EVENT_TEST/} /* probe ID $ID */ +$PROBE${EVENT_TEST:+ / $EVENT_TEST /} /* probe ID $ID */ {${TRACE:+ printf("<$ID>"); } diff --git a/sys/sys/param.h b/sys/sys/param.h index f636d41..4f6fb4e 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1101515 /* Master, propagated to newvers */ +#define __FreeBSD_version 1101516 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, |
