Page MenuHomeFreeBSD
Files F160234062

D57565.diff
No OneTemporary
Actions

D57565.diff
View Options

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
--- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
@@ -34,6 +34,7 @@
#include <sys/wait.h>
#include <dtrace.h>
+#include <ctype.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
@@ -823,7 +824,7 @@
static void
compile_str(dtrace_cmd_t *dcp)
{
- char *p;
+ char *p, *name;
if ((dcp->dc_prog = dtrace_program_strcompile(g_dtp, dcp->dc_arg,
dcp->dc_spec, g_cflags | DTRACE_C_PSPEC, g_argc, g_argv)) == NULL)
@@ -832,8 +833,17 @@
if ((p = strpbrk(dcp->dc_arg, "{/;")) != NULL)
*p = '\0'; /* crop name for reporting */
+ /* Strip whitespace from around the reported name. */
+ name = dcp->dc_arg;
+ while (isspace((unsigned char)*name))
+ name++;
+ p = name + strlen(name);
+ while (p > name && isspace((unsigned char)p[-1]))
+ p--;
+ *p = '\0';
+
dcp->dc_desc = "description";
- dcp->dc_name = dcp->dc_arg;
+ dcp->dc_name = name;
}
/*ARGSUSED*/

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 23, 10:46 AM (58 m, 46 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33958243
Default Alt Text
D57565.diff (1 KB)

Event Timeline