Changes in select.c [40bda84:27f6487]

File:

• select.c (modified) (7 diffs)

select.c

@@ -152 +152 @@
 }
 
-int owl_select_dispatch_count(void)
+int owl_select_dispatch_count()
 {
   return owl_list_get_size(owl_global_get_dispatchlist(&g));
@@ -205 +205 @@
   FD_ZERO(e);
   max_fd = 0;
-  len = owl_select_dispatch_count();
+  len = owl_select_dispatch_count(g);
   for(i = 0; i < len; i++) {
     d = owl_list_get_element(dl, i);
@@ -215 +215 @@
 }
 
-void owl_select_gc(void)
+void owl_select_gc()
 {
   int i;
@@ -325 +325 @@
 }
 
-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)
+void owl_select_handle_intr()
 {
   owl_input in;
 
   owl_global_unset_interrupted(&g);
-
-  sigprocmask(SIG_SETMASK, restore, NULL);
+  owl_function_unmask_sigint(NULL);
 
   in.ch = in.uch = owl_global_get_startup_tio(&g)->c_cc[VINTR];
@@ -346 +336 @@
 }
 
-void owl_select_check_tstp() {
-  if(owl_global_is_sigstp(&g)) {
-    owl_function_makemsg("Use :suspend to suspend.");
-    owl_global_unset_got_sigstp(&g);
-  }
-}
-
-void owl_select(void)
+void owl_select()
 {
   int i, max_fd, aim_max_fd, aim_done, ret;
@@ -364 +347 @@
   owl_select_process_timers(&timeout);
 
-  owl_select_mask_signals(&mask);
-
-  owl_select_check_tstp();
+  owl_function_mask_sigint(&mask);
   if(owl_global_is_interrupted(&g)) {
-    owl_select_handle_intr(&mask);
+    owl_select_handle_intr();
     return;
   }
@@ -400 +381 @@
   /* 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(NULL);
-    }
-    sigprocmask(SIG_SETMASK, &mask, NULL);
+      owl_select_handle_intr();
+    }
     return;
   }
 
-  sigprocmask(SIG_SETMASK, &mask, NULL);
+  owl_function_unmask_sigint(NULL);
 
   if(ret > 0) {