PERFORCE change 95399 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=95399

Change 95399 by jb at jb_freebsd2 on 2006/04/16 22:34:36

	Change the behaviour of ctfconvert and ctfmerge to be a little more
	forgiving. If there isn't any type data to convert, by all means say so,
	but don't go and delete the file and don't return an exit status that
	would cause the build to fail.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/die.c#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/die.c#3 (text) ====

@@ -54,7 +54,11 @@
 	if (format[strlen(format) - 1] != '\n')
 		(void) fprintf(stderr, ": %s\n", strerror(err));
 
+#if defined(__FreeBSD__)
+	exit(0);
+#else
 	exit(1);
+#endif
 }
 
 void
@@ -75,5 +79,9 @@
 	if (format[strlen(format) - 1] != '\n')
 		(void) fprintf(stderr, ": %s\n", elf_errmsg(elf_errno()));
 
+#if defined(__FreeBSD__)
+	exit(0);
+#else
 	exit(1);
+#endif
 }

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#3 (text) ====

@@ -65,10 +65,12 @@
 static void
 terminate_cleanup(void)
 {
+#if !defined(__FreeBSD__)
 	if (!outfile) {
 		fprintf(stderr, "Removing %s\n", infile);
 		unlink(infile);
 	}
+#endif
 }
 
 static void

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#3 (text) ====

@@ -608,10 +608,12 @@
 	if (outfile == NULL)
 		return;
 
+#if !defined(__FreeBSD__)
 	if (dounlink) {
 		fprintf(stderr, "Removing %s\n", outfile);
 		unlink(outfile);
 	}
+#endif
 }
 
 static void

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#2 (text) ====

@@ -129,7 +129,17 @@
 	if (terminate_cleanup)
 		terminate_cleanup();
 
+#if defined(__FreeBSD__)
+/*
+ * For the time being just output the termination message, but don't
+ * return an exit status that would cause the build to fail. We need
+ * to get as much stuff built as possible before going back and
+ * figuring out what is wrong with certain files.
+ */
+	exit(0);
+#else
 	exit(1);
+#endif
 }
 
 /*PRINTFLIKE1*/