some code fixes and refactoring
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
21
bin/cut.c
21
bin/cut.c
@@ -325,40 +325,35 @@ static void stop_run (int signo)
|
||||
#endif
|
||||
}
|
||||
|
||||
static void do_nothing (int unused)
|
||||
{
|
||||
/* do nothing */
|
||||
}
|
||||
|
||||
static void set_intr_run (void)
|
||||
{
|
||||
#if defined(SIGTERM)
|
||||
hawk_main_set_signal_handler (SIGTERM, stop_run, 0);
|
||||
hawk_main_set_signal_handler(SIGTERM, stop_run, 0);
|
||||
#endif
|
||||
#if defined(SIGHUP)
|
||||
hawk_main_set_signal_handler (SIGHUP, stop_run, 0);
|
||||
hawk_main_set_signal_handler(SIGHUP, stop_run, 0);
|
||||
#endif
|
||||
#if defined(SIGINT)
|
||||
hawk_main_set_signal_handler (SIGINT, stop_run, 0);
|
||||
hawk_main_set_signal_handler(SIGINT, stop_run, 0);
|
||||
#endif
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
|
||||
hawk_main_set_signal_handler (SIGPIPE, do_nothing, 0);
|
||||
hawk_main_set_signal_handler(SIGPIPE, hawk_main_do_nothing_on_signal, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void unset_intr_run (void)
|
||||
{
|
||||
#if defined(SIGTERM)
|
||||
hawk_main_unset_signal_handler (SIGTERM);
|
||||
hawk_main_unset_signal_handler(SIGTERM);
|
||||
#endif
|
||||
#if defined(SIGHUP)
|
||||
hawk_main_unset_signal_handler (SIGHUP);
|
||||
hawk_main_unset_signal_handler(SIGHUP);
|
||||
#endif
|
||||
#if defined(SIGINT)
|
||||
hawk_main_unset_signal_handler (SIGINT);
|
||||
hawk_main_unset_signal_handler(SIGINT);
|
||||
#endif
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
|
||||
hawk_main_unset_signal_handler (SIGPIPE);
|
||||
hawk_main_unset_signal_handler(SIGPIPE);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
24
bin/hawk.c
24
bin/hawk.c
@@ -125,56 +125,50 @@ static void stop_run (int signo)
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__)
|
||||
int e = errno;
|
||||
#endif
|
||||
|
||||
/*hawk_haltall(hawk_rtx_gethawk(app_rtx));*/
|
||||
hawk_rtx_halt (app_rtx);
|
||||
|
||||
hawk_rtx_halt(app_rtx);
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__)
|
||||
errno = e;
|
||||
#endif
|
||||
}
|
||||
|
||||
static void do_nothing (int unused)
|
||||
{
|
||||
}
|
||||
|
||||
static void set_intr_pipe (void)
|
||||
{
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
|
||||
hawk_main_set_signal_handler (SIGPIPE, do_nothing, 0);
|
||||
hawk_main_set_signal_handler(SIGPIPE, hawk_main_do_nothing_on_signal, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void unset_intr_pipe (void)
|
||||
{
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
|
||||
hawk_main_unset_signal_handler (SIGPIPE);
|
||||
hawk_main_unset_signal_handler(SIGPIPE);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void set_intr_run (void)
|
||||
{
|
||||
#if defined(SIGTERM)
|
||||
hawk_main_set_signal_handler (SIGTERM, stop_run, 0);
|
||||
hawk_main_set_signal_handler(SIGTERM, stop_run, 0);
|
||||
#endif
|
||||
#if defined(SIGHUP)
|
||||
hawk_main_set_signal_handler (SIGHUP, stop_run, 0);
|
||||
hawk_main_set_signal_handler(SIGHUP, stop_run, 0);
|
||||
#endif
|
||||
#if defined(SIGINT)
|
||||
hawk_main_set_signal_handler (SIGINT, stop_run, 0);
|
||||
hawk_main_set_signal_handler(SIGINT, stop_run, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void unset_intr_run (void)
|
||||
{
|
||||
#if defined(SIGTERM)
|
||||
hawk_main_unset_signal_handler (SIGTERM);
|
||||
hawk_main_unset_signal_handler(SIGTERM);
|
||||
#endif
|
||||
#if defined(SIGHUP)
|
||||
hawk_main_unset_signal_handler (SIGHUP);
|
||||
hawk_main_unset_signal_handler(SIGHUP);
|
||||
#endif
|
||||
#if defined(SIGINT)
|
||||
hawk_main_unset_signal_handler (SIGINT);
|
||||
hawk_main_unset_signal_handler(SIGINT);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -187,6 +187,13 @@ int hawk_main_unset_signal_handler (int sig)
|
||||
|
||||
/* -------------------------------------------------------- */
|
||||
|
||||
void hawk_main_do_nothing_on_signal (int unused)
|
||||
{
|
||||
/* do nothing */
|
||||
}
|
||||
|
||||
/* -------------------------------------------------------- */
|
||||
|
||||
int hawk_main_collect_into_xarg (const hawk_bcs_t* path, hawk_main_xarg_t* xarg)
|
||||
{
|
||||
if (xarg->size <= xarg->capa)
|
||||
|
||||
@@ -55,7 +55,7 @@ void hawk_main_print_warning (const hawk_bch_t* fmt, ...);
|
||||
|
||||
int hawk_main_set_signal_handler (int sig, hawk_main_sig_handler_t handler, int extra_flags);
|
||||
int hawk_main_unset_signal_handler (int sig);
|
||||
|
||||
void hawk_main_do_nothing_on_signal (int sig);
|
||||
|
||||
int hawk_main_collect_into_xarg (const hawk_bcs_t* path, hawk_main_xarg_t* xarg);
|
||||
void hawk_main_purge_xarg (hawk_main_xarg_t* xarg);
|
||||
|
||||
23
bin/sed.c
23
bin/sed.c
@@ -377,51 +377,44 @@ static void stop_run (int signo)
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__)
|
||||
int e = errno;
|
||||
#endif
|
||||
|
||||
hawk_sed_halt(g_sed);
|
||||
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__)
|
||||
errno = e;
|
||||
#endif
|
||||
}
|
||||
|
||||
static void do_nothing (int unused)
|
||||
{
|
||||
}
|
||||
|
||||
static void set_intr_run (void)
|
||||
{
|
||||
#if defined(SIGTERM)
|
||||
hawk_main_set_signal_handler (SIGTERM, stop_run, 0);
|
||||
hawk_main_set_signal_handler(SIGTERM, stop_run, 0);
|
||||
#endif
|
||||
#if defined(SIGHUP)
|
||||
hawk_main_set_signal_handler (SIGHUP, stop_run, 0);
|
||||
hawk_main_set_signal_handler(SIGHUP, stop_run, 0);
|
||||
#endif
|
||||
#if defined(SIGINT)
|
||||
hawk_main_set_signal_handler (SIGINT, stop_run, 0);
|
||||
hawk_main_set_signal_handler(SIGINT, stop_run, 0);
|
||||
#endif
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
|
||||
hawk_main_set_signal_handler (SIGPIPE, do_nothing, 0);
|
||||
hawk_main_set_signal_handler(SIGPIPE, hawk_main_do_nothing_on_signal, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void unset_intr_run (void)
|
||||
{
|
||||
#if defined(SIGTERM)
|
||||
hawk_main_unset_signal_handler (SIGTERM);
|
||||
hawk_main_unset_signal_handler(SIGTERM);
|
||||
#endif
|
||||
#if defined(SIGHUP)
|
||||
hawk_main_unset_signal_handler (SIGHUP);
|
||||
hawk_main_unset_signal_handler(SIGHUP);
|
||||
#endif
|
||||
#if defined(SIGINT)
|
||||
hawk_main_unset_signal_handler (SIGINT);
|
||||
hawk_main_unset_signal_handler(SIGINT);
|
||||
#endif
|
||||
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) && defined(SIGPIPE)
|
||||
hawk_main_unset_signal_handler (SIGPIPE);
|
||||
hawk_main_unset_signal_handler(SIGPIPE);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
#if defined(HAWK_ENABLE_SEDTRACER)
|
||||
static void trace_exec (hawk_sed_t* sed, hawk_sed_tracer_op_t op, const hawk_sed_cmd_t* cmd)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user