Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 29df844
Remove usage of backtraces it was anyway disabled for a while
Baptiste Daroussin committed 11 years ago
commit 29df8444b9b964042a6a8729ebf3ce1d490b9e41
parent 56528f2
7 files changed +0 -40
modified configure.ac
@@ -281,14 +281,6 @@ AC_CHECK_HEADERS([gelf.h libelf.h], [
	]])

	)])
- 
AC_CHECK_HEADER([execinfo.h], [
- 
	AC_DEFINE(HAVE_EXECINFO_H, 1, [Define to 1 if you have the <execinfo.h> header file.])
- 
	AC_CHECK_LIB(execinfo, backtrace, [
- 
		AC_DEFINE(HAVE_LIBEXECINFO, 1, [Define to 1 if you have the 'execinfo' library (-lexecinfo).])
- 
		LIBEXECINFO_LIB="-lexecinfo"
- 
	])
- 
])
- 


AC_ARG_WITH([ldns], AS_HELP_STRING([--with-ldns], [Build with ldns for name resolving]))



AS_IF([test "x$with_ldns" = "xyes"], [
@@ -391,7 +383,6 @@ AM_CONDITIONAL(HAVE_ELF_ABI, test "$ac_cv_binary_abi" = "elf")
AM_CONDITIONAL(LIBELF_BUNDLED, test "$ac_cv_binary_abi" = "elf" -a "$libelf_bundled" != "no")



AC_SUBST([LIBJAIL_LIB])
- 
AC_SUBST([LIBEXECINFO_LIB])

AC_SUBST([LIBBSD_LIB])

AC_SUBST([TESTS])

AC_SUBST([LDNS_LIBS])
modified libpkg/Makefile.am
@@ -81,7 +81,6 @@ libpkg_la_LIBADD= $(top_builddir)/compat/libbsd_compat.la \
			$(top_builddir)/external/libfetch.la \

			$(top_builddir)/external/blake2/libblake2.la \

			@REPOS_LDADD@ \
- 
			@LIBEXECINFO_LIB@ \

			@LDNS_LIBS@ \

			-larchive \

			-lutil \
modified libpkg/pkg_event.c
@@ -419,7 +419,6 @@ pkg_emit_error(const char *fmt, ...)


	pkg_emit_event(&ev);

	free(ev.e_pkg_error.msg);
- 
	print_trace();

}



void
@@ -465,7 +464,6 @@ pkg_emit_errno(const char *func, const char *arg)
	ev.e_errno.no = errno;



	pkg_emit_event(&ev);
- 
	print_trace();

}



void
modified libpkg/private/utils.h
@@ -44,7 +44,6 @@
#define ERROR_SQLITE(db, query) do { \

	pkg_emit_error("sqlite error while executing %s in file %s:%d: %s", (query), \

	__FILE__, __LINE__, sqlite3_errmsg(db));									 \
- 
	print_trace();																 \

} while(0)



#define HASH_FIND_INO(head,ino,out)                                          \
@@ -113,7 +112,6 @@ struct dns_srvinfo *
int set_nameserver(const char *nsname);

void set_blocking(int fd);

void set_nonblocking(int fd);
- 
void print_trace(void);



int pkg_symlink_cksum(const char *path, const char *root, char *cksum);

int pkg_symlink_cksumat(int fd, const char *path, const char *root,
modified libpkg/utils.c
@@ -34,9 +34,6 @@


#include <assert.h>

#include <errno.h>
- 
#ifdef HAVE_EXECINFO_H
- 
#include <execinfo.h>
- 
#endif

#include <fcntl.h>

#include <stdlib.h>

#include <unistd.h>
@@ -745,27 +742,6 @@ ucl_object_emit_sbuf(const ucl_object_t *obj, enum ucl_emitter emit_type,
	return (ret);

}
- 
void
- 
print_trace(void)
- 
{
- 
	return;
-
- 
#ifdef HAVE_EXECINFO_H
- 
	void *array[10];
- 
	size_t size;
- 
	char **strings;
- 
	size_t i;
-
- 
	size = backtrace(array, 10);
- 
	strings = backtrace_symbols(array, size);
-
- 
	for (i = 0; i < size; i++)
- 
		fprintf(stderr, "%s\n", strings[i]);
-
- 
	free(strings);
- 
#endif
- 
}
- 


static int

pkg_symlink_cksum_readlink(const char *linkbuf, int linklen, const char *root,

    char *cksum)
modified src/Makefile.am
@@ -57,7 +57,6 @@ pkg_static_LDADD= @OS_LDFLAGS@ \
			$(top_builddir)/external/libsbuf_static.la \

			$(pkg_OBJECTS) \

			@LIBJAIL_LIB@ \
- 
			@LIBEXECINFO_LIB@ \

			@LDNS_LIBS@ \

			@OS_LIBS@ \

			-larchive \
modified tests/Makefile.am
@@ -6,7 +6,6 @@ GENERIC_LDADD= $(top_builddir)/libpkg/libpkg_static.la \
		$(top_builddir)/external/libfetch_static.la \

		@LDNS_LIBS@ \

		@LIBJAIL_LIB@ \
- 
		@LIBEXECINFO_LIB@ \

		@OS_LIBS@ \

		-larchive \

		-lutil \