i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

the second parameter of sigprocmask() can be NULL

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18531 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-08-18 08:00:07 +00:00
parent 8cf2c839c5
commit a5a36fe421
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/signal.c
+8 -9
View File
@@ -385,6 +385,12 @@ sigprocmask(int how, const sigset_t *set, sigset_t *oldSet)
struct thread *thread = thread_get_current_thread(); struct thread *thread = thread_get_current_thread();
sigset_t oldMask = atomic_get(&thread->sig_block_mask); sigset_t oldMask = atomic_get(&thread->sig_block_mask);
if (oldSet != NULL)
*oldSet = oldMask;
if (set == NULL)
return B_OK;
switch (how) { switch (how) {
case SIG_BLOCK: case SIG_BLOCK:
atomic_or(&thread->sig_block_mask, *set & BLOCKABLE_SIGNALS); atomic_or(&thread->sig_block_mask, *set & BLOCKABLE_SIGNALS);
@@ -395,14 +401,10 @@ sigprocmask(int how, const sigset_t *set, sigset_t *oldSet)
case SIG_SETMASK: case SIG_SETMASK:
atomic_set(&thread->sig_block_mask, *set & BLOCKABLE_SIGNALS); atomic_set(&thread->sig_block_mask, *set & BLOCKABLE_SIGNALS);
break; break;
default: default:
return B_BAD_VALUE; return B_BAD_VALUE;
} }
if (oldSet != NULL)
*oldSet = oldMask;
return B_OK; return B_OK;
} }
@@ -591,14 +593,11 @@ _user_sigprocmask(int how, const sigset_t *userSet, sigset_t *userOldSet)
sigset_t set, oldSet; sigset_t set, oldSet;
status_t status; status_t status;
if (userSet == NULL) if ((userSet != NULL && user_memcpy(&set, userSet, sizeof(sigset_t)) < B_OK)
return B_BAD_VALUE;
if (user_memcpy(&set, userSet, sizeof(sigset_t)) < B_OK
|| (userOldSet != NULL && user_memcpy(&oldSet, userOldSet, sizeof(sigset_t)) < B_OK)) || (userOldSet != NULL && user_memcpy(&oldSet, userOldSet, sizeof(sigset_t)) < B_OK))
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
status = sigprocmask(how, &set, userOldSet ? &oldSet : NULL); status = sigprocmask(how, userSet ? &set : NULL, userOldSet ? &oldSet : NULL);
// copy old set if asked for // copy old set if asked for
if (status >= B_OK && userOldSet != NULL && user_memcpy(userOldSet, &oldSet, sizeof(sigset_t)) < B_OK) if (status >= B_OK && userOldSet != NULL && user_memcpy(userOldSet, &oldSet, sizeof(sigset_t)) < B_OK)