# HG changeset patch # User Jun Wu # Date 1483365875 0 # Node ID e9ec42634ec85d8d2a241aeac852be4b9efd9922 # Parent 9fa7255d4abd08dff537dbf05ef5977f8caa87c6 chg: decouple hgclient from setupsignalhandler procutil should not depend on hgclient. This patch makes the signal handling part independent from hgclient. diff -r 9fa7255d4abd -r e9ec42634ec8 contrib/chg/chg.c --- a/contrib/chg/chg.c Mon Jan 02 14:02:47 2017 +0000 +++ b/contrib/chg/chg.c Mon Jan 02 14:04:35 2017 +0000 @@ -429,7 +429,7 @@ gethgcmd()); } - setupsignalhandler(hgc); + setupsignalhandler(hgc_peerpid(hgc), hgc_peerpgid(hgc)); pagerpid = setuppager(hgc, argv + 1, argc - 1); int exitcode = hgc_runcommand(hgc, argv + 1, argc - 1); restoresignalhandler(); diff -r 9fa7255d4abd -r e9ec42634ec8 contrib/chg/procutil.c --- a/contrib/chg/procutil.c Mon Jan 02 14:02:47 2017 +0000 +++ b/contrib/chg/procutil.c Mon Jan 02 14:04:35 2017 +0000 @@ -71,14 +71,11 @@ kill(peerpid, SIGPIPE); } -static void setupsignalhandler(const hgclient_t *hgc) +static void setupsignalhandler(pid_t pid, pid_t pgid) { - pid_t pid = hgc_peerpid(hgc); if (pid <= 0) return; peerpid = pid; - - pid_t pgid = hgc_peerpgid(hgc); peerpgid = (pgid <= 1 ? 0 : pgid); struct sigaction sa;