Skip to content

Fix cu signal handler #3349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simbit18 merged 2 commits into from
Jan 20, 2026
Merged

Fix cu signal handler #3349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aa3122
system/cu: fix signal handler to use sa_sigaction
ThePassionate Jan 20, 2026
f02f26e
system/cu: merge the cu.h to cu_main.c
extinguish Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 0 additions & 92 deletions system/cu/cu.h
View file
Open in desktop

This file was deleted.

47 changes: 43 additions & 4 deletions system/cu/cu_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,26 @@
#include <stdlib.h>
#include <signal.h>
#include <debug.h>
#include <stdint.h>
#include <stdbool.h>
#include <semaphore.h>
#include <termios.h>

#include "system/readline.h"

#include "cu.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/

/* Configuration ************************************************************/

#ifndef CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE
# define CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE "/dev/ttyS0"
#endif

#ifndef CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD
# define CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD 115200
#endif

#ifdef CONFIG_SYSTEM_CUTERM_DISABLE_ERROR_PRINT
# define cu_error(...)
Expand All @@ -75,6 +91,21 @@ enum parity_mode
PARITY_ODD,
};

/* All terminal state data is packaged in a single structure to minimize
* name conflicts with other global symbols -- a poor man's name space.
*/

struct cu_globals_s
{
int devfd; /* I/O data to serial port */
int stdfd; /* I/O data to standard console */
int escape; /* Escape char */
struct termios devtio; /* Original serial port setting */
struct termios stdtio; /* Original standard console setting */
pthread_t listener; /* Terminal listener thread */
bool force_exit; /* Force exit */
};

/****************************************************************************
* Private Data
****************************************************************************/
Expand Down Expand Up @@ -123,7 +154,7 @@ static FAR void *cu_listener(FAR void *parameter)
}

#ifdef CONFIG_ENABLE_ALL_SIGNALS
static void sigint(int sig)
static void cu_exit(int signo, FAR siginfo_t *siginfo, FAR void *context)
{
FAR struct cu_globals_s *cu = siginfo->si_user;
cu->force_exit = true;
Expand Down Expand Up @@ -302,8 +333,16 @@ int main(int argc, FAR char *argv[])
/* Install signal handlers */

memset(&sa, 0, sizeof(sa));
sa.sa_handler = sigint;
sigaction(SIGINT, &sa, NULL);
sa.sa_user = &cu;
sa.sa_sigaction = cu_exit;
sigemptyset(&sa.sa_mask);
if (sigaction(SIGINT, &sa, NULL) < 0)
{
cu_error("cu_main: ERROR during setup cu_exit sigaction(): %d\n",
errno);
return EXIT_FAILURE;
}

#endif
optind = 0; /* Global that needs to be reset in FLAT mode */
while ((option = getopt(argc, argv, "l:s:ceE:fho?")) != ERROR)
Expand Down
Loading