diff options
author | dim <dim@FreeBSD.org> | 2011-12-16 21:48:09 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2011-12-16 21:48:09 +0000 |
commit | cecb0df44ace82dde5b1eef441bb02fb5459aeb4 (patch) | |
tree | 9215a20eaa53e7eda405cb72ba0edaf5c1a33d84 /cddl | |
parent | 4296e211b6cbcacab4fd71ad8a3e3570b3da2236 (diff) | |
download | FreeBSD-src-cecb0df44ace82dde5b1eef441bb02fb5459aeb4.zip FreeBSD-src-cecb0df44ace82dde5b1eef441bb02fb5459aeb4.tar.gz |
In cddl/contrib/opensolaris/cmd/dtrace/dtrace.c, fix some obtuse
snprintf tricks.
MFC after: 1 week
Diffstat (limited to 'cddl')
-rw-r--r-- | cddl/contrib/opensolaris/cmd/dtrace/dtrace.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c index 63721ab..a276659 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c @@ -671,9 +671,12 @@ link_prog(dtrace_cmd_t *dcp) p[0] = '\0'; /* strip .d suffix */ (void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile), "%s.o", basename(dcp->dc_arg)); + } else if (g_cmdc > 1) { + (void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile), + "d.out.%td", dcp - g_cmdv); } else { (void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile), - g_cmdc > 1 ? "%s.%d" : "%s", "d.out", (int)(dcp - g_cmdv)); + "d.out"); } if (dtrace_program_link(g_dtp, dcp->dc_prog, DTRACE_D_PROBES, |