aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Marcelo Arenas Belón <carenas@gmail.com>2025-07-10 19:45:42 +0000
committerJunio C Hamano <gitster@pobox.com>2025-07-10 14:19:15 -0700
commitef03aa432ab7fffa81a866ec21e08ecd8a876a26 (patch)
tree0f56e73717c5c8c1517c2ec8aaed5dcba07f0d08
parentcb3b40381e1d5ee32dde96521ad7cfd68eb308a6 (diff)
downloadgit-ef03aa432ab7fffa81a866ec21e08ecd8a876a26.tar.gz
compat/mingw: allow sigaction(SIGCHLD)
A future change will start using sigaction to setup a SIGCHLD signal handler. The current code uses signal(), which returns SIG_ERR (but doesn't seem to set errno) so instruct sigaction() to do the same. A new SA flag will be needed, so copy the one from Cygwin; note that the sigaction() implementation that is provided won't use it, so its value is otherwise irrelevant. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--compat/mingw-posix.h1
-rw-r--r--compat/mingw.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/compat/mingw-posix.h b/compat/mingw-posix.h
index 88e0cf9292..631a208684 100644
--- a/compat/mingw-posix.h
+++ b/compat/mingw-posix.h
@@ -96,6 +96,7 @@ struct sigaction {
unsigned sa_flags;
};
#define SA_RESTART 0
+#define SA_NOCLDSTOP 1
struct itimerval {
struct timeval it_value, it_interval;
diff --git a/compat/mingw.c b/compat/mingw.c
index 8a9972a1ca..5d69ae32f4 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2561,7 +2561,9 @@ int setitimer(int type UNUSED, struct itimerval *in, struct itimerval *out)
int sigaction(int sig, struct sigaction *in, struct sigaction *out)
{
- if (sig != SIGALRM)
+ if (sig == SIGCHLD)
+ return -1;
+ else if (sig != SIGALRM)
return errno = EINVAL,
error("sigaction only implemented for SIGALRM");
if (out)