chiark - git - mdw - termux-packages/blob - packages/git/run-command.c.patch

   1 diff -u -r ../git-2.13.2/run-command.c ./run-command.c
   2 --- ../git-2.13.2/run-command.c 2017-06-25 00:50:12.000000000 +0200
   3 +++ ./run-command.c     2017-06-25 20:16:53.815627960 +0200
   4 @@ -491,8 +491,10 @@
   5  #else
   6         bug_die(pthread_sigmask(SIG_SETMASK, &all, &as->old),
   7                 "blocking all signals");
   8 +# ifndef __ANDROID__
   9         bug_die(pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &as->cs),
  10                 "disabling cancellation");
  11 +# endif
  12  #endif
  13  }
  14
  15 @@ -502,8 +504,10 @@
  16         if (sigprocmask(SIG_SETMASK, &as->old, NULL))
  17                 die_errno("sigprocmask");
  18  #else
  19 +# ifndef __ANDROID__
  20         bug_die(pthread_setcancelstate(as->cs, NULL),
  21                 "re-enabling cancellation");
  22 +# endif
  23         bug_die(pthread_sigmask(SIG_SETMASK, &as->old, NULL),
  24                 "restoring signal mask");
  25  #endif