From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id A45DB386F819 for ; Sat, 31 Jul 2021 13:22:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A45DB386F819 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-x32c.google.com with SMTP id n12-20020a05600c3b8cb029025a67bbd40aso764731wms.0 for ; Sat, 31 Jul 2021 06:22:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ah/JpXftrotE8B4+yKd/qOjSKXQSCvdJsiSNFUF3Mp0=; b=M6VbR79haY0S6AJnVBasyywQt5bA3Zt3JMIjRs+FjNsn1B+98AnG1hD8a4yHNqH6/7 0fxNa5NsUWXbbac1uF56X2VTs185mCdl86u0plgoLdcgPTDtSLhiwa1D75JYJm8MHsfD hzvQS7QSdisji7r2hMg9dG9qT3a22u7L1db3UiHiEavJduqKvEH9LLxFcrL58kDxHSKR eq1ET42yzt6VpT4XSl1t9gJfJcfzT88nk4IZ8/vgjxmzcPU44Dkl9/VwwF6rF2HvkUeH dlcMIneP7RKbIw3enwcQvGkvNVIbfkfT/FPE1XoJ2H5TIGAxUcmkvQ4GUkMdmTNorJKP Jp8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ah/JpXftrotE8B4+yKd/qOjSKXQSCvdJsiSNFUF3Mp0=; b=SVshAerHQ3k3M62qBYB4zaUHu5MIKcc3D8/scAoC54xdM08JZ6p7PHOodEX/SMCPQ3 h2LL+bXBVhRE/NReijeDZSncFXNVq4diVHSATLJIYOWD2zXAvMLpReAhL9fh2+5hTc92 iEvudDZcMunySSDi/G3/Yfx1S+vfqjQCiM8QFbgj6nM7S05AxjTT2bABtlovQYumeleN f4TcFX+imOyS2+t2L89+nWVPpv6ugyPoQXiHmKMI8hiz1jd0cT5i7DSL1URm8uOgm8LJ Pk2M1Lpz+IjR1zVbWmViCFwtnZhfbHu2577oIlj9c4TSTs6UiGcJ3KQ+jg+LBXMJXBzJ 5aLA== X-Gm-Message-State: AOAM531AccIxbZIbzsDZlp2aRavc6uEVC5sLJPeUSGcwzMGh6vtGeRkf JB3C79C9Dit5PvAhq6ceK9p44NAAK7H1 X-Google-Smtp-Source: ABdhPJxBG2Z5g/I2Kzpibkeu6JPlnrFzAvGG5NHdoeNa32c2tA7TFFoYmorZdRzvAD9/ihGYMBAH5g== X-Received: by 2002:a1c:ed03:: with SMTP id l3mr7771828wmh.56.1627737743384; Sat, 31 Jul 2021 06:22:23 -0700 (PDT) Received: from localhost.localdomain (p579c3e59.dip0.t-ipconnect.de. [87.156.62.89]) by smtp.gmail.com with ESMTPSA id k17sm5042500wrw.53.2021.07.31.06.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Jul 2021 06:22:22 -0700 (PDT) From: Matt Joyce To: newlib@sourceware.org Cc: Matt Joyce Subject: [PATCH 1/1] libc: Added implementation for sig2str/str2sig. Date: Sat, 31 Jul 2021 15:22:05 +0200 Message-Id: <20210731132205.536278-2-mfjoyce2004@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210731132205.536278-1-mfjoyce2004@gmail.com> References: <20210731132205.536278-1-mfjoyce2004@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jul 2021 13:22:26 -0000 Added implementations for sig2str() and str2sig() in libc/signal in order to improve POSIX compliance. Added fucntion prototypes in libc/include/sys/signal.h. --- newlib/libc/include/sys/signal.h | 17 ++ newlib/libc/signal/Makefile.am | 4 +- newlib/libc/signal/sig2str.c | 298 +++++++++++++++++++++++++++++++ 3 files changed, 317 insertions(+), 2 deletions(-) create mode 100644 newlib/libc/signal/sig2str.c diff --git a/newlib/libc/include/sys/signal.h b/newlib/libc/include/sys/signal.h index 45cc0366c..9c1c0e3c2 100644 --- a/newlib/libc/include/sys/signal.h +++ b/newlib/libc/include/sys/signal.h @@ -12,6 +12,7 @@ extern "C" { #include #include #include +#include #if !defined(_SIGSET_T_DECLARED) #define _SIGSET_T_DECLARED @@ -238,6 +239,22 @@ int sigqueue (pid_t, int, const union sigval); #endif /* __POSIX_VISIBLE >= 199309 */ +/* Using __MISC_VISIBLE until POSIX Issue 8 is officially released */ +#if __MISC_VISIBLE + +/* POSIX Issue 8 adds sig2str() and str2sig() */ + +#if __STDINT_EXP(INT_MAX) > 0x7fff +#define SIG2STR_MAX (sizeof("RTMAX+") + sizeof("4294967295") - 1) +#else +#define SIG2STR_MAX (sizeof("RTMAX+") + sizeof("65535") - 1) +#endif + +int sig2str(int, char *); +int str2sig(const char *__restrict, int *__restrict); + +#endif /* __MISC_VISIBLE */ + #if defined(___AM29K__) /* These all need to be defined for ANSI C, but I don't think they are meaningful. */ diff --git a/newlib/libc/signal/Makefile.am b/newlib/libc/signal/Makefile.am index a93dba7a9..89db26113 100644 --- a/newlib/libc/signal/Makefile.am +++ b/newlib/libc/signal/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = psignal.c raise.c signal.c +LIB_SOURCES = psignal.c raise.c signal.c sig2str.c libsignal_la_LDFLAGS = -Xcompiler -nostdlib @@ -21,6 +21,6 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -CHEWOUT_FILES = psignal.def raise.def signal.def +CHEWOUT_FILES = psignal.def raise.def signal.def sig2str.def CHAPTERS = signal.tex diff --git a/newlib/libc/signal/sig2str.c b/newlib/libc/signal/sig2str.c new file mode 100644 index 000000000..c02fcacbd --- /dev/null +++ b/newlib/libc/signal/sig2str.c @@ -0,0 +1,298 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2021 Matthew Joyce + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + */ + +/* +FUNCTION +<>---translate between signal number and name +<>---translate between signal name and number + +INDEX + sig2str +INDEX + str2sig + +SYNOPSIS + #include + int sig2str(int <[signum]>, char *<[str]>); + + int str2sig(const char *restrict <[str]>, int *restrict <[pnum]>); + +DESCRIPTION +The <> function translates the signal number specified by <[signum]> to +a signal name and stores this string in the location specified by <[str}>. The +application must ensure that <[str]> points to a location that can store the +string including the terminating null byte. The symbolic constant +<[SIG2STR_MAX]> defined in `<>' gives the maximum number of bytes +required. + +The <> function translates the signal name in the string pointed to by +<[str]> to a signal number and stores this value in the location specified by +<[pnum]>. + +RETURNS +<> returns <<0>> if <[signum]>> is a valid, supported signal number. +Otherwise, it returns <<-1>>. + +<> returns <<0>> if it stores a value in the location pointed to by +<[pnum]>. Otherwise it returns <<-1>>. +*/ + +#include +#include +#include +#include + +#define SPACES_TO_N 6 /* Allows indexing to RT Signal number in str2sig */ +#define NUM_OF_SIGS (sizeof(sig_array) / sizeof(sig_name_and_num)) + +typedef struct sig_name_and_num { + const char *sig_name; + const int sig_num; +} sig_name_and_num; + +static const sig_name_and_num sig_array[] = { + { "EXIT", 0 }, + #ifdef SIGHUP + { "HUP", SIGHUP }, + #endif + #ifdef SIGINT + { "INT", SIGINT }, + #endif + #ifdef SIGQUIT + { "QUIT", SIGQUIT }, + #endif + #ifdef SIGILL + { "ILL", SIGILL }, + #endif + #ifdef SIGTRAP + { "TRAP", SIGTRAP }, + #endif + #ifdef SIGABRT + { "ABRT", SIGABRT }, + #endif + #ifdef SIGIOT + { "IOT", SIGIOT}, + #endif + #ifdef SIGEMT + { "EMT", SIGEMT }, + #endif + #ifdef SIGFPE + { "FPE", SIGFPE }, + #endif + #ifdef SIGKILL + { "KILL", SIGKILL }, + #endif + #ifdef SIGBUS + { "BUS", SIGBUS }, + #endif + #ifdef SIGSEGV + { "SEGV", SIGSEGV }, + #endif + #ifdef SIGSYS + { "SYS", SIGSYS }, + #endif + #ifdef SIGPIPE + { "PIPE", SIGPIPE }, + #endif + #ifdef SIGALRM + { "ALRM", SIGALRM }, + #endif + #ifdef SIGTERM + { "TERM", SIGTERM }, + #endif + #ifdef SIGURG + { "URG", SIGURG }, + #endif + #ifdef SIGSTOP + { "STOP", SIGSTOP }, + #endif + #ifdef SIGTSTP + { "TSTP", SIGTSTP }, + #endif + #ifdef SIGCONT + { "CONT", SIGCONT }, + #endif + #ifdef SIGCHLD + { "CHLD", SIGCHLD }, + #endif + #ifdef SIGCLD + { "CLD", SIGCLD }, + #endif + #ifdef SIGTTIN + { "TTIN", SIGTTIN }, + #endif + #ifdef SIGTTOU + { "TTOU", SIGTTOU }, + #endif + #ifdef SIGIO + { "IO", SIGIO }, + #endif + #ifdef SIGPOLL + { "POLL", SIGPOLL }, + #endif + #ifdef SIGWINCH + { "WINCH", SIGWINCH }, + #endif + #ifdef SIGUSR1 + { "USR1", SIGUSR1 }, + #endif + #ifdef SIGUSR2 + { "USR2", SIGUSR2 }, + #endif + #ifdef SIGPWR + { "PWR", SIGPWR }, + #endif + #ifdef SIGXCPU + { "XCPU", SIGXCPU }, + #endif + #ifdef SIGXFSZ + { "XFSZ", SIGXFSZ }, + #endif + #ifdef SIGVTALRM + { "VTALRM", SIGVTALRM }, + #endif + #ifdef SIGPROF + { "PROF", SIGPROF }, + #endif + #ifdef SIGLOST + { "LOST", SIGLOST }, + #endif + /* The Issue 8 standard requires that SIGRTMIN and SIGRTMAX be included + * as valid results to be saved from calls to sig2str/str2sig. */ + #ifdef SIGRTMIN + { "RTMIN", SIGRTMIN }, + #endif + #ifdef SIGRTMAX + { "RTMAX", SIGRTMAX } + #endif +}; + +int +sig2str(int signum, char *str) +{ + const sig_name_and_num *sptr; + + /* If signum falls in lower half of the real time signals range, define + * the saved str value as "RTMIN+n" according to the Issue 8 standard */ + if ((SIGRTMIN + 1) <= signum && + signum <= (SIGRTMIN + SIGRTMAX) / 2) { + sprintf(str, "RTMIN+%d", (signum-SIGRTMIN)); + return 0; + } + + /* If signum falls in upper half of the real time signals range, define + * the saved str value as "RTMAX-m" according to the Issue 8 standard */ + if ((((SIGRTMIN + SIGRTMAX) / 2) + 1) <= signum && + signum <= (SIGRTMAX - 1)) { + sprintf(str, "RTMAX-%d", (SIGRTMAX - signum)); + return 0; + } + + /* Otherwise, search for signal matching signum in sig_array. If found, + * save its string value in str. */ + for (sptr = sig_array; sptr < &sig_array[NUM_OF_SIGS]; sptr++) { + if (sptr->sig_num == signum) { + strcpy(str, sptr->sig_name); + return 0; + } + } + + /* If signum is not a recognized signal number, return -1 */ + return -1; +} + +int +str2sig(const char *restrict str, int *restrict pnum) +{ + unsigned long j = 0; + char *endp; + const sig_name_and_num *sptr; + unsigned long is_valid_decimal; + + /* i686 Cygwin only supports one RT signal. For this case, skip checks + * for "RTMIN+n" and "RTMAX-m". */ + if (SIGRTMIN != SIGRTMAX) { + + /* If str is in RT signal range, get number of of RT signal, save it as an + * integer. */ + if (strncmp(str, "RTMIN+", SPACES_TO_N) == 0) { + j = strtoul(&str[SPACES_TO_N], &endp, 10); + + /* If number is valid, save it in pnum. */ + if (*endp == '\0') { + if (1 <= j && + j <= ((SIGRTMAX - SIGRTMIN)-1)) { + *pnum = (SIGRTMIN + j); + return 0; + } + return -1; + } + return -1; + } + + /* If str is in RT signal range, get number of of RT signal, save it as an + * integer. */ + if (strncmp(str, "RTMAX-", SPACES_TO_N) == 0) { + j = strtoul(&str[SPACES_TO_N], &endp, 10); // and endptr null check + + /* If number is valid, save it in pnum. */ + if (*endp == '\0') { + if (1 <= j && + j <= ((SIGRTMAX - SIGRTMIN)-1)) { + *pnum = (SIGRTMAX - j); + return 0; + } + return -1; + } + return -1; + } + } + + /*If str is a valid signal name, save its corresponding number in pnum. */ + for (sptr = sig_array; sptr < &sig_array[NUM_OF_SIGS]; sptr++) { + if (strcmp(sptr->sig_name, str) == 0) { + *pnum = sptr->sig_num; + return 0; + } + } + + /* str was not found in sig_array. Check whether str is a string + * representation of a valid integer. */ + is_valid_decimal = strtoul(str, &endp, 10); + + if (*endp != '\0') { + return -1; + } + + /* If str is a representation of a decimal value, save its integer value + * in pnum. */ + if (1 <= is_valid_decimal && + is_valid_decimal <= SIGRTMAX) { + *pnum = is_valid_decimal; + return 0; + } + return -1; +} -- 2.31.1