5100576 The ctfmerge should use better temporary file name

6314988 ctfconvert's debug option can coredump
6321459 resurrect_functions doesn't skip ignored symbols
6326300 tdtrav_su can return an initialized value
6409619 write_ctf() should behave more like ld and open O_RDWR
6415503 strtab_write() reads stack garbage, bravely staggers on

1 files changed, 12 insertions, 14 deletions

diff --git a/usr/src/tools/ctf/cvt/util.c b/usr/src/tools/ctf/cvt/util.c
index 2add463248..6b4f4f2d9c 100644
--- a/usr/src/tools/ctf/cvt/util.c
+++ b/usr/src/tools/ctf/cvt/util.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -175,18 +174,11 @@ debug(int level, char *format, ...)
 char *
 mktmpname(const char *origname, const char *suffix)
 {
-	const char *dot;
 	char *newname;
-	size_t newlen;
-
-	if (!(dot = strrchr(origname, '.')))
-		dot = origname + strlen(origname);
-
-	newlen = dot - origname + strlen(suffix) + 1;
-	newname = xmalloc(newlen);
-	snprintf(newname, newlen, "%*.*s%s", dot - origname, dot - origname,
-	    origname, suffix);
 
+	newname = xmalloc(strlen(origname) + strlen(suffix) + 1);
+	(void) strcpy(newname, origname);
+	(void) strcat(newname, suffix);
 	return (newname);
 }
 
@@ -203,3 +195,9 @@ elfterminate(const char *file, const char *fmt, ...)
 
 	terminate("%s: %s: %s\n", file, msgbuf, elf_errmsg(elf_errno()));
 }
+
+const char *
+tdesc_name(tdesc_t *tdp)
+{
+	return (tdp->t_name == NULL ? "(anon)" : tdp->t_name);
+}