Changeset f97c1a6 for functions.c
- Timestamp:
- May 23, 2011, 9:09:44 PM (13 years ago)
- Branches:
- master, release-1.10, release-1.8, release-1.9
- Children:
- 33b6431b
- Parents:
- 4c7c21f (diff), 1d21d9f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
functions.c
r3b8a563 rf97c1a6 2991 2991 i--; 2992 2992 } 2993 owl_function_mask_sigint(NULL); 2994 if(owl_global_is_interrupted(&g)) { 2995 owl_global_unset_interrupted(&g); 2996 owl_function_unmask_sigint(NULL); 2993 if (owl_global_take_interrupt(&g)) { 2997 2994 owl_function_makemsg("Search interrupted!"); 2998 2995 owl_mainwin_redisplay(owl_global_get_mainwin(&g)); 2999 2996 return; 3000 2997 } 3001 owl_function_unmask_sigint(NULL);3002 2998 } 3003 2999 owl_mainwin_redisplay(owl_global_get_mainwin(&g)); … … 3082 3078 ret=ZLocateUser(zstr(user), &numlocs, ZAUTH); 3083 3079 3084 owl_function_mask_sigint(NULL); 3085 if(owl_global_is_interrupted(&g)) { 3080 if (owl_global_take_interrupt(&g)) { 3086 3081 interrupted = 1; 3087 owl_global_unset_interrupted(&g);3088 owl_function_unmask_sigint(NULL);3089 3082 owl_function_makemsg("Interrupted!"); 3090 3083 break; 3091 3084 } 3092 3093 owl_function_unmask_sigint(NULL);3094 3085 3095 3086 if (ret!=ZERR_NONE) { … … 3496 3487 } 3497 3488 3498 void owl_function_mask_sigint(sigset_t *oldmask) {3499 sigset_t intr;3500 3501 sigemptyset(&intr);3502 sigaddset(&intr, SIGINT);3503 sigprocmask(SIG_BLOCK, &intr, oldmask);3504 }3505 3506 void owl_function_unmask_sigint(sigset_t *oldmask) {3507 sigset_t intr;3508 3509 sigemptyset(&intr);3510 sigaddset(&intr, SIGINT);3511 sigprocmask(SIG_UNBLOCK, &intr, oldmask);3512 }3513 3514 3489 void _owl_function_mark_message(const owl_message *m) 3515 3490 {
Note: See TracChangeset
for help on using the changeset viewer.