Attachment #352418 for bug #475422

Lines 3-8 Link Here

(-)a/connman-1.15/config.h.in (+3 lines)
3	/* Define to 1 if you have the <dlfcn.h> header file. */	3	/* Define to 1 if you have the <dlfcn.h> header file. */
4	#undef HAVE_DLFCN_H	4	#undef HAVE_DLFCN_H
5		5
		6	/* Define to 1 if you have the <execinfo.h> header file. */
		7	#undef HAVE_EXECINFO_H
		8
6	/* Define to 1 if you have the <inttypes.h> header file. */	9	/* Define to 1 if you have the <inttypes.h> header file. */
7	#undef HAVE_INTTYPES_H	10	#undef HAVE_INTTYPES_H
8		11




fi


for ac_header in execinfo.h
do :
  ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
if test "x$ac_cv_header_execinfo_h" = xyes; then :
  cat >>confdefs.h <<_ACEOF
#define HAVE_EXECINFO_H 1
_ACEOF

fi

done


{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
if ${ac_cv_lib_dl_dlopen+:} false; then :

Lines 181-186 Link Here

(-)a/connman-1.15/configure.ac (+2 lines)
181	AC_CHECK_FUNC(signalfd, dummy=yes,	181	AC_CHECK_FUNC(signalfd, dummy=yes,
182	AC_MSG_ERROR(signalfd support is required))	182	AC_MSG_ERROR(signalfd support is required))
183		183
		184	AC_CHECK_HEADERS([execinfo.h], [], [])
		185
184	AC_CHECK_LIB(dl, dlopen, dummy=yes,	186	AC_CHECK_LIB(dl, dlopen, dummy=yes,
185	AC_MSG_ERROR(dynamic linking loader is required))	187	AC_MSG_ERROR(dynamic linking loader is required))
186		188




#include <stdlib.h>
#include <string.h>
#include <syslog.h>
#ifdef HAVE_EXECINFO_H
#include <execinfo.h>
#endif
#include <dlfcn.h>

#include "connman.h"

	va_end(ap);
}

#ifdef HAVE_EXECINFO_H
static void print_backtrace(unsigned int offset)
{
	void *frames[99];

	close(outfd[1]);
	close(infd[0]);
}
#endif

static void signal_handler(int signo)
{
	connman_error("Aborting (signal %d) [%s]", signo, program_exec);

#ifdef HAVE_EXECINFO_H
	print_backtrace(2);
#endif

	exit(EXIT_FAILURE);
}

Return to bug 475422

Lines 12641-12646 Link Here

(-)a/connman-1.15/configure (+13 lines)
12641	fi	12641	fi
12642		12642
12643		12643
		12644	for ac_header in execinfo.h
		12645	do :
		12646	ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
		12647	if test "x$ac_cv_header_execinfo_h" = xyes; then :
		12648	cat >>confdefs.h <<_ACEOF
		12649	#define HAVE_EXECINFO_H 1
		12650	_ACEOF
		12651
		12652	fi
		12653
		12654	done
		12655
		12656
12644	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5	12657	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
12645	$as_echo_n "checking for dlopen in -ldl... " >&6; }	12658	$as_echo_n "checking for dlopen in -ldl... " >&6; }
12646	if ${ac_cv_lib_dl_dlopen+:} false; then :	12659	if ${ac_cv_lib_dl_dlopen+:} false; then :

Lines 30-36 Link Here

(-)a/connman-1.15/src/log.c (+6 lines)
30	#include <stdlib.h>	30	#include <stdlib.h>
31	#include <string.h>	31	#include <string.h>
32	#include <syslog.h>	32	#include <syslog.h>
		33	#ifdef HAVE_EXECINFO_H
33	#include <execinfo.h>	34	#include <execinfo.h>
		35	#endif
34	#include <dlfcn.h>	36	#include <dlfcn.h>
35		37
36	#include "connman.h"	38	#include "connman.h"
Lines 110-115 Link Here
110	va_end(ap);	112	va_end(ap);
111	}	113	}
112		114
		115	#ifdef HAVE_EXECINFO_H
113	static void print_backtrace(unsigned int offset)	116	static void print_backtrace(unsigned int offset)
114	{	117	{
115	void *frames[99];	118	void *frames[99];
Lines 211-222 Link Here
211	close(outfd[1]);	214	close(outfd[1]);
212	close(infd[0]);	215	close(infd[0]);
213	}	216	}
		217	#endif
214		218
215	static void signal_handler(int signo)	219	static void signal_handler(int signo)
216	{	220	{
217	connman_error("Aborting (signal %d) [%s]", signo, program_exec);	221	connman_error("Aborting (signal %d) [%s]", signo, program_exec);
218		222
		223	#ifdef HAVE_EXECINFO_H
219	print_backtrace(2);	224	print_backtrace(2);
		225	#endif
220		226
221	exit(EXIT_FAILURE);	227	exit(EXIT_FAILURE);
222	}	228	}