Fix sigint handling when running in helper mode

cli_helper/kart.c

@@ -194,7 +194,7 @@
 /**
  * @brief Exit signal handler for SIGALRM
  */
-void exit_on_alarm(int sig)
+void exit_on_sigalrm(int sig)
 {
     int semval = semctl(semid, SEMNUM, GETVAL);
     if (semval < 0)
@@ -209,6 +209,21 @@
     exit(exit_code);
 }
 
+char *socket_filename;
+
+/**
+ * @brief Exit signal handler for SIGINT
+ */
+void exit_on_sigint(int sig)
+{
+    putchar('\n');
+    const char* kill_cmd_template = "lsof -t '%s' | xargs kill";
+    char* kill_cmd = malloc(strlen(kill_cmd_template) + strlen(socket_filename) + 2);
+    sprintf(kill_cmd, kill_cmd_template, socket_filename);
+    system(kill_cmd);
+    exit(128 + sig);
+}
+
 int main(int argc, char **argv, char **environ)
 {
     char cmd_path[PATH_MAX];
@@ -267,7 +282,7 @@
         int fp = open(getcwd(NULL, 0), O_RDONLY);
         int fds[4] = {fileno(stdin), fileno(stdout), fileno(stderr), fp};
 
-        char *socket_filename = malloc(strlen(getenv("HOME")) + strlen(".kart.socket") + 2);
+        socket_filename = malloc(strlen(getenv("HOME")) + strlen(".kart.socket") + 2);
         sprintf(socket_filename, "%s/%s", getenv("HOME"), ".kart.socket");
         int socket_fd = socket(AF_UNIX, SOCK_STREAM, 0);
 
@@ -370,7 +385,8 @@
         memcpy((int *)CMSG_DATA(cmsg), fds, sizeof(fds));
         msg.msg_controllen = cmsg->cmsg_len;
 
-        signal(SIGALRM, exit_on_alarm);
+        signal(SIGALRM, exit_on_sigalrm);
+        signal(SIGINT, exit_on_sigint);
 
         if (sendmsg(socket_fd, &msg, 0) < 0)
         {

kart/__init__.py

@@ -199,7 +199,10 @@ def _cleanup_process_group(signum, stack_frame):
             if _kart_process_group_killed:
                 return
             _kart_process_group_killed = True
-            os.killpg(os.getpid(), signum)
+            try:
+                os.killpg(os.getpid(), signum)
+            except Exception:
+                pass
             sys.exit(128 + signum)
 
         signal.signal(signal.SIGTERM, _cleanup_process_group)