Merge lp:~xnox/libnih/fix-for-997359 into lp:libnih

[Dimitri John Ledkov]

Cherry pick from lp:ubuntu/libnih to fix the linked bug.

[Dimitri John Ledkov (xnox)]

libnih development has moved on to github.

review: Disapprove

Unmerged revisions

1055. By James Hunt on 2012-12-17

* nih/logging.c: Use our own __nih_abort_msg rather than the (e)glibc
  private symbol __abort_msg to avoid upgrade issues (LP: #997359).
* nih/tests/test_logging.c: Update tests for __nih_abort_msg.

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-01 18:41:03 +0000
+++ ChangeLog	2012-12-17 09:58:49 +0000
@@ -1,3 +1,9 @@
[phone]  James Hunt  <[e-mail]>
+
+	* nih/logging.c: Use our own __nih_abort_msg rather than the
+	(e)glibc private symbol __abort_msg to avoid upgrade issues (LP: #997359).
+	* nih/tests/test_logging.c: Update tests for __nih_abort_msg.
+
 2011-08-31  James Hunt  <[e-mail]>
 
 	* nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c
 
=== modified file 'nih/logging.c'
--- nih/logging.c	2010-02-04 18:24:58 +0000
+++ nih/logging.c	2012-12-17 09:58:49 +0000
@@ -39,11 +39,11 @@
 
 
 /**
- * __abort_msg:
+ * __nih_abort_msg:
  *
- * A glibc variable that keeps the assertion message in the core dump.
+ * A variable that keeps the assertion message in the core dump.
  **/
-extern char *__abort_msg __attribute__ ((weak));
+char *__nih_abort_msg;
 
 /**
  * logger:
@@ -114,19 +114,19 @@
  * nih_log_abort_message:
  * @message: message to be logged.
  *
- * Save @message in the glibc __abort_msg variable so it can be retrieved
+ * Save @message in the __nih_abort_msg variable so it can be retrieved
  * by debuggers if we should crash at this point.
  **/
 static void
 nih_log_abort_message (const char *message)
 {
-	if (! &__abort_msg)
+	if (! &__nih_abort_msg)
 		return;
 
-	if (__abort_msg)
-		nih_discard (__abort_msg);
+	if (__nih_abort_msg)
+		nih_discard (__nih_abort_msg);
 
-	__abort_msg = NIH_MUST (nih_strdup (NULL, message));
+	__nih_abort_msg = NIH_MUST (nih_strdup (NULL, message));
 }
 
 /**
 
=== modified file 'nih/tests/test_logging.c'
--- nih/tests/test_logging.c	2010-02-04 18:24:58 +0000
+++ nih/tests/test_logging.c	2012-12-17 09:58:49 +0000
@@ -31,7 +31,7 @@
 #include <nih/main.h>
 
 
-extern char *__abort_msg __attribute__ ((weak));
+extern char *__nih_abort_msg;
 
 static NihLogLevel last_priority = NIH_LOG_UNKNOWN;
 static char *      last_message = NULL;
@@ -156,13 +156,13 @@
 	}
 
 
-	/* Check that a fatal message is also stored in the glibc __abort_msg
+	/* Check that a fatal message is also stored in the __nih_abort_msg
 	 * variable.
 	 */
-	if (&__abort_msg) {
+	if (&__nih_abort_msg) {
 		TEST_FEATURE ("with fatal message");
 		TEST_ALLOC_FAIL {
-			__abort_msg = NULL;
+			__nih_abort_msg = NULL;
 			last_priority = NIH_LOG_UNKNOWN;
 			last_message = NULL;
 
@@ -174,16 +174,16 @@
 			TEST_EQ (last_priority, NIH_LOG_FATAL);
 			TEST_EQ_STR (last_message, "message with some 20 formatting");
 
-			TEST_NE_P (__abort_msg, NULL);
-			TEST_ALLOC_PARENT (__abort_msg, NULL);
-			TEST_EQ_STR (__abort_msg, "message with some 20 formatting");
+			TEST_NE_P (__nih_abort_msg, NULL);
+			TEST_ALLOC_PARENT (__nih_abort_msg, NULL);
+			TEST_EQ_STR (__nih_abort_msg, "message with some 20 formatting");
 
 			free (last_message);
 		}
 
 
 		/* Check that a fatal message can safely overwrite one already stored
-		 * in the glibc __abort_msg variable.
+		 * in the __nih_abort_msg variable.
 		 */
 		TEST_FEATURE ("with second fatal message");
 		TEST_ALLOC_FAIL {
@@ -191,7 +191,7 @@
 				msg = nih_strdup (NULL, "test");
 			}
 
-			__abort_msg = msg;
+			__nih_abort_msg = msg;
 			TEST_FREE_TAG (msg);
 
 			last_priority = NIH_LOG_UNKNOWN;
@@ -207,14 +207,14 @@
 
 			TEST_FREE (msg);
 
-			TEST_NE_P (__abort_msg, NULL);
-			TEST_ALLOC_PARENT (__abort_msg, NULL);
-			TEST_EQ_STR (__abort_msg, "message with some 20 formatting");
+			TEST_NE_P (__nih_abort_msg, NULL);
+			TEST_ALLOC_PARENT (__nih_abort_msg, NULL);
+			TEST_EQ_STR (__nih_abort_msg, "message with some 20 formatting");
 
 			free (last_message);
 		}
 	} else {
-		printf ("SKIP: __abort_msg not available\n");
+		printf ("SKIP: __nih_abort_msg not available\n");
 	}