Changeset 39457 for trunk/Ohana/src/opihi/lib.shell/interrupt.c

Timestamp:

Mar 11, 2016, 10:23:42 PM (10 years ago)

Author:

eugene

Message:

modify to pass with extremely pedantic build; force consistency for signed vs unsigned and int sizes; various relastro updates

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/lib.shell/interrupt.c (modified) (5 diffs)

trunk/Ohana/src/opihi/lib.shell/interrupt.c

@@ -7 +7 @@
 
 void handle_interrupt (int input) {
+  OHANA_UNUSED_PARAM(input);
   
   char string[64];
   int Nask;
 
-  signal (SIGINT, SIG_IGN);
+  // signal (SIGINT, SIG_IGN);
 
   Nask = 0;
@@ -31 +32 @@
     if ((string[0] == 'y') || (string[0] == 'Y')) {
       interrupt = FALSE;
-      signal (SIGINT, handle_interrupt);
+      // signal (SIGINT, handle_interrupt);
       Nint = 0;
       return;
@@ -38 +39 @@
     if ((string[0] == 'n') || (string[0] == 'N')) {
       interrupt = TRUE;
-      signal (SIGINT, handle_interrupt);
+      // signal (SIGINT, handle_interrupt);
       Nint = 0;
       return;
@@ -45 +46 @@
     if (Nask > 3) {
       interrupt = TRUE;
-      signal (SIGINT, handle_interrupt);
+      // signal (SIGINT, handle_interrupt);
       Nint = 0;
       return;
@@ -52 +53 @@
 
 }
+
+struct sigaction *SetInterrupt () {
+
+  struct sigaction  new_sigaction;
+  struct sigaction *old_sigaction;
+
+  ALLOCATE (old_sigaction, struct sigaction, 1);
+
+  new_sigaction.sa_handler = handle_interrupt;
+  new_sigaction.sa_flags = 0;
+
+  int sigstat = sigaction (SIGINT, &new_sigaction, old_sigaction);
+  if (sigstat) {
+    perror ("failed to set signal handler: ");
+    free (old_sigaction);
+    return NULL;
+  }
+
+  interrupt = FALSE;
+  return old_sigaction;
+}
+
+int ClearInterrupt (struct sigaction *old_sigaction) {
+
+  // interrupt = FALSE;
+
+  if (!old_sigaction) return TRUE;
+
+  struct sigaction new_sigaction;
+
+  if (sigaction (SIGINT, old_sigaction, &new_sigaction)) {
+    perror ("failed to reset signal handler: ");
+    FREE (old_sigaction);
+    return FALSE;
+  }
+  FREE (old_sigaction);
+
+  return TRUE;
+}