From owner-p4-projects@FreeBSD.ORG  Sun Apr 16 22:35:29 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA75716A403; Sun, 16 Apr 2006 22:35:29 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8983916A401
	for <perforce@freebsd.org>; Sun, 16 Apr 2006 22:35:29 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3AD7E43D46
	for <perforce@freebsd.org>; Sun, 16 Apr 2006 22:35:29 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3GMZTFt073633
	for <perforce@freebsd.org>; Sun, 16 Apr 2006 22:35:29 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3GMZSpj073627
	for perforce@freebsd.org; Sun, 16 Apr 2006 22:35:28 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 16 Apr 2006 22:35:28 GMT
Message-Id: <200604162235.k3GMZSpj073627@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95399 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Apr 2006 22:35:29 -0000

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

Change 95399 by jb@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*/