[patch] patch to remove backtrace usage + execinfo.h include

musl_support.patch (text/plain), 2.99 KB, created by w.iron.zombie on 2025-02-11 03:03:00 UTC

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a95fd7..155c541 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,7 +137,6 @@ endif(EXISTS ${CMAKE_SOURCE_DIR}/.git)
 enable_testing()
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Backtrace REQUIRED)
 find_package(Filesystem REQUIRED)
 if(WITH_GETTEXT)
 	find_package(Gettext)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6defc8b..bf5ee1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -197,9 +197,6 @@ add_executable(${APP_EXEC}
 	util.cpp
 	util.hpp
 )
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	set(OTHER_LIBRARIES "-latomic")
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 add_executable(${DAEMON_EXEC}
 	daemon_server.cpp
@@ -267,7 +264,6 @@ add_definitions(-DPRGVER="${PROJECT_VERSION}"
 target_link_libraries(${APP_EXEC}
 	${Intl_LIBRARIES}
 	${CMAKE_THREAD_LIBS_INIT}
-	${Backtrace_LIBRARIES}
 	std::filesystem
 
 	${GTK3_LIBRARIES}
diff --git a/src/main.cpp b/src/main.cpp
index 5517b98..eb0a2a7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,7 +22,6 @@
 */
 
 #include <unistd.h>
-#include <execinfo.h>
 #include <getopt.h>
 #include <cstdlib>
 #include <cstring>
@@ -396,16 +395,10 @@ static void parse_arguments(std::forward_list<std::string> &cmd_args)
 
 static void common_sighandler(int signum, bool need_stop)
 {
-	int bt_size, i;
-	char **bt_syms;
-	void *bt[16];
+	int i;
 	std::string::size_type addr_start, addr_end;
 	std::string line, address, line_number;
 
-	/* Get the backtrace */
-	bt_size = backtrace(bt, 16);
-	bt_syms = backtrace_symbols(bt, bt_size);
-
 	/* Print the backtrace */
 	Logger::set_verbosity(LOG_ERROR); // disable DEBUG mode for popen_to_str()
 	if(need_stop)
@@ -413,26 +406,6 @@ static void common_sighandler(int signum, bool need_stop)
 	else
 		MSG_ERROR(_("\nOops, something was wrong! %s has received signal %d (%s) and is trying to recover."), PRGNAME, signum, strsignal(signum));
 
-	MSG_ERROR("%s", "========================= Backtrace =========================");
-	PRGINFO(stderr);
-	for(i = 1; i < bt_size; i++)
-	{
-		line_number.clear();
-		line       = bt_syms[i];
-		addr_start = line.find("[");
-		addr_end   = line.find("]");
-		if((addr_start != std::string::npos) && (addr_end != std::string::npos))
-		{
-			addr_start++;
-			address = line.substr(addr_start, addr_end - addr_start);
-			popen_to_str(line_number, "addr2line -s -e /proc/%d/exe %s | cut -d' ' -f1", getpid(), address.c_str());
-		}
-		if(!line_number.empty() && (line_number.find("??") == std::string::npos))
-			MSG_ERROR("#%2i %s %s", i, line_number.c_str(), bt_syms[i]);
-		else
-			MSG_ERROR("#%2i %s", i, bt_syms[i]);
-	}
-	MSG_ERROR("%s\n", "======================== End Backtrace =======================");
 	if(need_stop)
 	{
 		MSG_ERROR("%s", _("You can open a new issue here, by filling the template as requested:"));
@@ -440,7 +413,6 @@ static void common_sighandler(int signum, bool need_stop)
 	}
 
 	/* Stop program */
-	free(bt_syms);
 	if(need_stop)
 	{
 		std::signal(signum, SIG_DFL);