Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc/signal and include/signal.h: Rename sigset() to signal(). sigset() is the System V function; signal() is the obsoleted POSIX name. These seem to be equivalent. Neither are relevant in modern POSIX programming but the name signal() probably has better credentials. sigset() is now relegated to a #define in signal.h that makes it equivalent to signal().

Browse Source
This commit is contained in:
Gregory Nutt
2016-04-10 14:35:45 -06:00
parent 502ac79e0c
commit 28a4ca6713
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libc/signal/Make.defs
+1 -1
View File
@@ -39,7 +39,7 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y)
CSRCS += sig_emptyset.c sig_fillset.c sig_addset.c sig_delset.c
CSRCS += sig_ismember.c sig_hold.c sig_relse.c sig_ignore.c sig_pause.c
CSRCS += sig_set.c
CSRCS += signal.c
# Add the signal directory to the build
libc/signal/sig_set.c → libc/signal/signal.c
+15 -15
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* libc/signal/sig_set.c
* libc/signal/signal.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -44,39 +44,39 @@
****************************************************************************/
/****************************************************************************
* Name: sigset
* Name: signal
*
* Description:
* The sigset() function will modify signal dispositions. The 'signo'
* argument specifies the signal. The 'disp' argument specifies the
* The signal() function will modify signal dispositions. The 'signo'
* argument specifies the signal. The 'func' argument specifies the
* signal's disposition, which may be SIG_DFL, SIG_IGN, or the address
* of a signal handler. If 'disp' is the address of a signal handler, the
* of a signal handler. If 'func' is the address of a signal handler, the
* system will add 'signo' to the calling process' signal mask before
* executing the signal handler; when the signal handler returns, the
* system will restore the calling process' signal mask to its state prior
* to the delivery of the signal. 'signo' will be removed from the calling
* process' signal mask.
*
* NOTE: The value SIG_HOLD for 'disp' is not supported. It should work
* like this: If 'disp' is equal to SIG_HOLD, 'signo' will be added to,
* NOTE: The value SIG_HOLD for 'func' is not supported. It should work
* like this: If 'func' is equal to SIG_HOLD, 'signo' will be added to,
* not removed from, the calling process' signal mask and 'signo''s
* disposition will remain unchanged.
*
* Input Parameters:
* signo - Identifies the signal to operate on
* disp - The new disposition of the signal
* func - The new disposition of the signal
*
* Returned Value:
* Upon successful completion, sigset() will the previous disposition of
* Upon successful completion, signal() will the previous disposition of
* the signal. Otherwise, SIG_ERR will be returned and errno set to
* indicate the error.
*
* NOTE: sigset() would return SIG_HOLD if the signal had been blocked and
* NOTE: signal() would return SIG_HOLD if the signal had been blocked and
* the signal's previous disposition if it had not been blocked.
*
****************************************************************************/
void (*sigset(int signo, void (*disp)(int)))(int)
CODE void (*signal(int signo, CODE void (*func)(int signo)))(int signo)
{
struct sigaction act;
struct sigaction oact;
@@ -84,7 +84,7 @@ void (*sigset(int signo, void (*disp)(int)))(int)
/* Initialize the sigaction structure */
act.sa_handler = disp;
act.sa_handler = func;
act.sa_flags = 0;
(void)sigemptyset(&act.sa_mask);
@@ -94,7 +94,7 @@ void (*sigset(int signo, void (*disp)(int)))(int)
* and cannot be distinguished.
*/
if (disp != SIG_DFL /* && disp != SIG_IGN */)
if (func != SIG_DFL /* && func != SIG_IGN */)
{
/* Add the signal to the set of signals to be ignored when the signal
* handler executes.
@@ -113,7 +113,7 @@ void (*sigset(int signo, void (*disp)(int)))(int)
ret = sigaction(signo, &act, &oact);
/* Upon successful completion, sigset() will the signal's previous
/* Upon successful completion, signal() will the signal's previous
* disposition. Otherwise, SIG_ERR will be returned and errno set to
* indicate the error.
*/