Changeset f97c1a6 for functions.c


Ignore:
Timestamp:
May 23, 2011, 9:09:44 PM (10 years ago)
Author:
David Benjamin <davidben@mit.edu>
Branches:
master, 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.
Message:
Merge branch 'g_main_loop'

The logic in owl_select_prune_bad_fds still needs to be reimplemented.

Conflicts:
	configure.ac
	owl.c
	select.c
File:
1 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    r3b8a563 rf97c1a6  
    29912991      i--;
    29922992    }
    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)) {
    29972994      owl_function_makemsg("Search interrupted!");
    29982995      owl_mainwin_redisplay(owl_global_get_mainwin(&g));
    29992996      return;
    30002997    }
    3001     owl_function_unmask_sigint(NULL);
    30022998  }
    30032999  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
     
    30823078          ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
    30833079
    3084           owl_function_mask_sigint(NULL);
    3085           if(owl_global_is_interrupted(&g)) {
     3080          if (owl_global_take_interrupt(&g)) {
    30863081            interrupted = 1;
    3087             owl_global_unset_interrupted(&g);
    3088             owl_function_unmask_sigint(NULL);
    30893082            owl_function_makemsg("Interrupted!");
    30903083            break;
    30913084          }
    3092 
    3093           owl_function_unmask_sigint(NULL);
    30943085
    30953086          if (ret!=ZERR_NONE) {
     
    34963487}
    34973488
    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 
    35143489void _owl_function_mark_message(const owl_message *m)
    35153490{
Note: See TracChangeset for help on using the changeset viewer.