From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
	id E15963857C48; Wed, 15 Mar 2023 21:10:51 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E15963857C48
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1678914651;
	bh=+y+NXkSSh+RvNLol7JXyr6IDn+F7uqzHRSiggg5wNpM=;
	h=From:To:Subject:Date:From;
	b=JyhRD98Iirgo2RAx2Kc3e5ljOcochqPYTYCwgYfqz0f3YlZQeVDtChQf+dcMe9+Tu
	 UFgoo6fd3d0OooWpybkaobLcelWQLCt597SVMsRDiLa1o5k/lYJqHTWZJd2j45pb/3
	 dw1Bds7FMhj5pW53DnG7Zans9XHhmoo1PWaiQTP0=
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/main] Cygwin: kill(1): align real-time signal naming to Linux kill(1)
X-Act-Checkin: newlib-cygwin
X-Git-Author: Corinna Vinschen <corinna@vinschen.de>
X-Git-Refname: refs/heads/main
X-Git-Oldrev: 3569e3577c9de2b3a5cffba40597d2755bf5aacd
X-Git-Newrev: 3dfb3217af2d1bc4be430675b6e591606aaa56fb
Message-Id: <20230315211051.E15963857C48@sourceware.org>
Date: Wed, 15 Mar 2023 21:10:51 +0000 (GMT)
List-Id: <cygwin-cvs.sourceware.org>

https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D3dfb3217af2=
d1bc4be430675b6e591606aaa56fb

commit 3dfb3217af2d1bc4be430675b6e591606aaa56fb
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Wed Mar 15 21:54:13 2023 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Wed Mar 15 22:08:04 2023 +0100

    Cygwin: kill(1): align real-time signal naming to Linux kill(1)
   =20
    Allow RT<N>, RTMIN+<N> and RTMAX-<N> for RT signals.
    Translate RT signal numbers to an "RT<N>" string.
   =20
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/utils/kill.cc | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/winsup/utils/kill.cc b/winsup/utils/kill.cc
index fc984c0b471e..a430b353720b 100644
--- a/winsup/utils/kill.cc
+++ b/winsup/utils/kill.cc
@@ -71,13 +71,51 @@ print_version ()
 static const char *
 strsigno (int signo)
 {
-  if (signo > 0 && signo < NSIG)
+  static char sigbuf[8];
+
+  if (signo > 0 && signo < SIGRTMIN)
     return sys_sigabbrev[signo];
+  if (signo <=3D SIGRTMAX)
+    {
+      snprintf (sigbuf, sizeof sigbuf, "SIGRT%d", signo - SIGRTMIN);
+      return sigbuf;
+    }
   static char buf[sizeof ("Unknown signal") + 32];
   sprintf (buf, "Unknown signal %d", signo);
   return buf;
 }
=20
+static int
+strtortsig (const char *sig)
+{
+  bool neg =3D false;
+  char *endp =3D NULL;
+  int signo;
+
+  sig +=3D 5;
+  if (!strcmp (sig, "MIN"))
+    return SIGRTMIN;
+  if (!strcmp (sig, "MAX"))
+    return SIGRTMAX;
+  if (!strncmp (sig, "MIN+", 4))
+    sig +=3D 4;
+  else if (!strncmp (sig, "MAX-", 4))
+    {
+      sig +=3D 4;
+      neg =3D true;
+    }
+  signo =3D strtoul (sig, &endp, 10);
+  if (!endp || *endp)
+    return 0;
+  if (neg)
+    signo =3D SIGRTMAX - signo;
+  else
+    signo =3D SIGRTMIN + signo;
+  if (signo < SIGRTMIN || signo > SIGRTMAX)
+    return 0;
+  return signo;
+}
+
 static int
 getsig (const char *in_sig)
 {
@@ -92,7 +130,10 @@ getsig (const char *in_sig)
       sprintf (buf, "SIG%-.20s", in_sig);
       sig =3D buf;
     }
-  intsig =3D strtosigno (sig) ?: atoi (in_sig);
+  if (!strncmp (sig, "SIGRT", 5))
+    intsig =3D strtortsig (sig);
+  else
+    intsig =3D strtosigno (sig) ?: atoi (in_sig);
   char *p;
   if (!intsig && (strcmp (sig, "SIG0") !=3D 0 && (strtol (in_sig, &p, 10) =
!=3D 0 || *p)))
     intsig =3D -1;