diff options
author | Elliott Hughes <enh@google.com> | 2013-10-16 22:27:54 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2013-10-17 11:36:55 -0700 |
commit | c7e9b2331771e5e87c34a8ee3dc6cc41d35b02fe (patch) | |
tree | c04816a58f739d9f76c12a0f5acf1676eed6c89c /libc/bionic/sigdelset.cpp | |
parent | f89f1eaa6071111c2ef584e97efb23f1b5dbdd2d (diff) | |
download | bionic-c7e9b2331771e5e87c34a8ee3dc6cc41d35b02fe.zip bionic-c7e9b2331771e5e87c34a8ee3dc6cc41d35b02fe.tar.gz bionic-c7e9b2331771e5e87c34a8ee3dc6cc41d35b02fe.tar.bz2 |
Fix sigaction(3) for 64-bit.
Also clean up <signal.h> and revert the hacks that were necessary
for 64-bit in linker/debugger.cpp until now.
Change-Id: I3b0554ca8a49ee1c97cda086ce2c1954ebc11892
Diffstat (limited to 'libc/bionic/sigdelset.cpp')
-rw-r--r-- | libc/bionic/sigdelset.cpp | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/libc/bionic/sigdelset.cpp b/libc/bionic/sigdelset.cpp new file mode 100644 index 0000000..9eea250 --- /dev/null +++ b/libc/bionic/sigdelset.cpp @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <signal.h> + +int sigdelset(sigset_t* set, int signum) { + int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0. + unsigned long* local_set = (unsigned long*) set; + if (set == NULL || bit < 0 || bit >= (int) (8*sizeof(sigset_t))) { + errno = EINVAL; + return -1; + } + local_set[bit / LONG_BIT] &= ~(1UL << (bit % LONG_BIT)); + return 0; +} |