Muldersoft/SlunkCrypt
Muldersoft/SlunkCrypt
1
0
Fork 0
Code Releases 6 Activity

Improved signal handling on Linux/BSD.

Browse Source
This commit is contained in:
LoRd_MuldeR 2020-10-20 19:13:11 +02:00
parent aeb7d1af4a
commit 64fa094b9f
Signed by: mulder
GPG Key ID: 2B5913365F57E03F
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/main.c
View File

@ -157,7 +157,6 @@ static void sigint_handler(const int sig)
if (sig == SIGINT) if (sig == SIGINT)
{ {
g_slunkcrypt_abort_flag = 1; g_slunkcrypt_abort_flag = 1;
signal(SIGINT, sigint_handler);
} }
} }
@ -557,7 +556,7 @@ static int run_self_test(void)
int MAIN(const int argc, CHR *const argv[]) int MAIN(const int argc, CHR *const argv[])
{ {
init_terminal(); init_terminal();
signal(SIGINT, sigint_handler); setup_signal_handler(SIGINT, sigint_handler);
int result = -1; int result = -1;
FPRINTF(stderr, T("SlunkCrypt Utility (%") T(PRIstr) T("-%") T(PRIstr) T("), by LoRd_MuldeR <MuldeR2@GMX.de>\n"), OS_TYPE, CPU_ARCH); FPRINTF(stderr, T("SlunkCrypt Utility (%") T(PRIstr) T("-%") T(PRIstr) T("), by LoRd_MuldeR <MuldeR2@GMX.de>\n"), OS_TYPE, CPU_ARCH);

14
frontend/src/utils.c
View File

@ -13,6 +13,7 @@
#include "utils.h" #include "utils.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <signal.h>
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
@ -48,6 +49,19 @@ void init_terminal(void)
#endif #endif
} }
void setup_signal_handler(const int signo, signal_handler_t* const handler)
{
#ifdef _WIN32
signal(signo, handler);
#else
struct sigaction act;
act.sa_handler = handler;
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
sigaction(signo, &act, NULL);
#endif
}
char* CHR_to_utf8(const CHR*const input) char* CHR_to_utf8(const CHR*const input)
{ {
#ifdef _WIN32 #ifdef _WIN32

3
frontend/src/utils.h
View File

@ -9,7 +9,10 @@
#include "platform.h" #include "platform.h"
#include <stdint.h> #include <stdint.h>
typedef void (signal_handler_t)(int);
void init_terminal(void); void init_terminal(void);
void setup_signal_handler(const int signo, signal_handler_t* const handler);
char* CHR_to_utf8(const CHR *const input); char* CHR_to_utf8(const CHR *const input);
uint64_t get_file_size(FILE* const file); uint64_t get_file_size(FILE* const file);
const CHR *get_file_name(const CHR *path); const CHR *get_file_name(const CHR *path);