Changeset 40bda84 for select.c

Timestamp:

Oct 3, 2009, 10:11:30 AM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

340c3e7

Parents:

e2f7963

git-author:

Nelson Elhage <nelhage@mit.edu> (09/14/09 21:06:14)

git-committer:

Nelson Elhage <nelhage@mit.edu> (10/03/09 10:11:30)

Message:

Catch ^Z and display a message instead of suspending.

File:

• select.c (modified) (3 diffs)

select.c

@@ -325 +325 @@
 }
 
-void owl_select_handle_intr(void)
+void owl_select_mask_signals(sigset_t *oldmask) {
+  sigset_t set;
+
+  sigemptyset(&set);
+  sigaddset(&set, SIGINT);
+  sigaddset(&set, SIGTSTP);
+  sigprocmask(SIG_BLOCK, &set, oldmask);
+}
+
+void owl_select_handle_intr(sigset_t *restore)
 {
   owl_input in;
 
   owl_global_unset_interrupted(&g);
-  owl_function_unmask_sigint(NULL);
+
+  sigprocmask(SIG_SETMASK, restore, NULL);
 
   in.ch = in.uch = owl_global_get_startup_tio(&g)->c_cc[VINTR];
   owl_process_input_char(in);
+}
+
+void owl_select_check_tstp() {
+  if(owl_global_is_sigstp(&g)) {
+    owl_function_makemsg("Use :suspend to suspend.");
+    owl_global_unset_got_sigstp(&g);
+  }
 }
 
@@ -347 +364 @@
   owl_select_process_timers(&timeout);
 
-  owl_function_mask_sigint(&mask);
+  owl_select_mask_signals(&mask);
+
+  owl_select_check_tstp();
   if(owl_global_is_interrupted(&g)) {
-    owl_select_handle_intr();
+    owl_select_handle_intr(&mask);
     return;
   }
@@ -381 +400 @@
   /* END AIM HACK */
 
-
   ret = pselect(max_fd+1, &r, &aim_wfds, &e, &timeout, &mask);
 
   if(ret < 0 && errno == EINTR) {
+    owl_select_check_tstp();
     if(owl_global_is_interrupted(&g)) {
-      owl_select_handle_intr();
-    }
+      owl_select_handle_intr(NULL);
+    }
+    sigprocmask(SIG_SETMASK, &mask, NULL);
     return;
   }
 
-  owl_function_unmask_sigint(NULL);
+  sigprocmask(SIG_SETMASK, &mask, NULL);
 
   if(ret > 0) {