Changeset 8daf504

Timestamp:

Jun 2, 2009, 12:48:48 PM (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:

bc8275e

Parents:

fd8dfe7

Message:

Allow SIGINT to interrupt getting the Zephyr buddy list

If we're behind a NAT or Zephyr is losing for some other reason, 'l' will
hang for (30 seconds) * (size of .anyone). Allow SIGINT to interrupt it
and cause us to bail out early. ZLocateUser will still hang for up to 30
seconds before that takes effect, but that's better than having to wait
for all of them.

File:

• functions.c (modified) (4 diffs)

functions.c

@@ -3065 +3065 @@
 {
   int i, j, x, idle;
+  int interrupted = 0;
   owl_fmtext fm;
   owl_buddylist *bl;
@@ -3113 +3114 @@
           user=owl_list_get_element(&anyone, i);
           ret=ZLocateUser(user, &numlocs, ZAUTH);
+
+          owl_function_mask_sigint(NULL);
+          if(owl_global_is_interrupted(&g)) {
+            interrupted = 1;
+            owl_global_unset_interrupted(&g);
+            owl_function_unmask_sigint(NULL);
+            owl_function_makemsg("Interrupted!");
+            break;
+          }
+
           if (ret!=ZERR_NONE) {
+          owl_function_unmask_sigint(NULL);
             owl_function_error("Error getting location for %s", user);
             continue;
@@ -3137 +3149 @@
       }
       owl_list_free_all(&anyone, owl_free);
-    } 
+    }
   }
 #endif
@@ -3150 +3162 @@
       }
   }
-  
-  owl_function_popless_fmtext(&fm);
+
+  if(!interrupted) {
+    owl_function_popless_fmtext(&fm);
+  }
   owl_fmtext_free(&fm);
 }