From 654b14ae5fdd2093f5bd849371c5dd1c4171da51 Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 31 Dec 2011 19:56:25 +0000 Subject: [PATCH 37/65] MFC r228598: In cddl/contrib/opensolaris/cmd/dtrace/dtrace.c, fix some obtuse snprintf tricks. git-svn-id: http://svn.freebsd.org/base/stable/9@229148 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f (cherry picked from commit 3b2bee9bca422dd92b6c8505392a9e92d7051bc4) Signed-off-by: Xin Li --- 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, -- 1.7.8.3