You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1011 B
41 lines
1011 B
From e7dac76ce61039fefa58985c955afccb60dabe87 Mon Sep 17 00:00:00 2001
|
|
From: Rosen Penev <rosenp@gmail.com>
|
|
Date: Wed, 29 Apr 2020 15:55:55 -0700
|
|
Subject: [PATCH] libisns: remove sighold and sigrelse
|
|
|
|
The man page says that these are deprecated. Use sugprocmask as a replacement.
|
|
---
|
|
include/libisns/util.h | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/include/libisns/util.h b/include/libisns/util.h
|
|
index e5ed037..f1b97f0 100644
|
|
--- a/include/libisns/util.h
|
|
+++ b/include/libisns/util.h
|
|
@@ -41,14 +41,22 @@ char * print_size(unsigned long);
|
|
*/
|
|
static inline void signals_hold(void)
|
|
{
|
|
- sighold(SIGTERM);
|
|
- sighold(SIGINT);
|
|
+ sigset_t s;
|
|
+
|
|
+ sigemptyset(&s);
|
|
+ sigaddset(&s, SIGTERM);
|
|
+ sigaddset(&s, SIGINT);
|
|
+ sigprocmask(SIG_BLOCK, &s, 0);
|
|
}
|
|
|
|
static inline void signals_release(void)
|
|
{
|
|
- sigrelse(SIGTERM);
|
|
- sigrelse(SIGINT);
|
|
+ sigset_t s;
|
|
+
|
|
+ sigemptyset(&s);
|
|
+ sigaddset(&s, SIGTERM);
|
|
+ sigaddset(&s, SIGINT);
|
|
+ sigprocmask(SIG_UNBLOCK, &s, 0);
|
|
}
|
|
|
|
/*
|