From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 18665 invoked from network); 26 Mar 2023 08:29:12 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 26 Mar 2023 08:29:12 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1679819353; b=ZcYOpX1zI4vFaVv4TYvbPv+O7aaQiWc469j+h9YLffND6E3BW1SlLLRfLJrJ+jIoBnG9vkv8Oe t5v+gFc54UNjlf8nZGu7z86/pTtT4PC0GiTDXIkCCzmc3WSuPClb8CN4M4/bkD/ragKk3PqEHG 6OEJIFVwjtaE4OSIoRvFPt5YP2/3ZcRip9BjB8IB3RxRbCV3Cf+vX1cAgH0h9hTzjJDgJw9bt3 NeJ7DyHDFPlUpRpNoqasqnpB0N7pvezRlw/8p/q4yuwHXgcj5KdjqN//mH9oOznhuA2TkH8HHA pX+8KvNQ8d8D+HivrkbwBpbeV3Mx0ycy95ss/bN8jHCQtA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-lf1-f54.google.com) smtp.remote-ip=209.85.167.54; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1679819353; bh=wEjpwFNiANPsysISaUyOr48N9DmPAFtanxSIw5iMaGs=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:DKIM-Signature:DKIM-Signature; b=b76loK2J6ua9IG42JL5yb1Gmf3g2cdynVBdVEspSjN+NwXDzfFMrhNutskwm+zigZIw0CgojLm r2LAbrSOelDPOXcoVoyQrMiq+ty7NXYA6VhJh4VBfjbqb04znEbiyadih7NjhPYqcjV+CYXFmj ldRv1rhRGr/XkAp0GBrBHroRNuqWavlGoLEbF/TrQsbVa+RR+9ROPMXvOSE5SivYMDb1FM5roA WT0VIMH81bh89M58e8s8QqNKwRoUhwohtS8VKCVXvzT5kbQqh3ccdGBJb2H5ltYaWoy8T8jSYZ Rea0L5y9kcoqr+pMeeQS/WE+SobpT294aZYdEz2Vyo2TGg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=5ED3NHx+k/Xc2DAfcuezcXxsJstmx48ODrUqk1WDRMo=; b=YunRJDIGRq9w4nZ4Ay0QJ8Nqlz KftX9cbUthfgekAzL/SHdGvJX2XDiJCW+LXudxoeSpcW2nfVNAJKqtMXkvNlkTTsSa8oshEWtJ85w Q8Ax8saDyX3Wy2L2FeFKXQPIUiRFmSVDJLZipQYwBEXEOt7e/Y2VGAPEu7p2Gv7OHDovKly/mKgSd eRu1O7whVBrGrJYOWBE+7wTdiCl5/0Qn0zzQ1UoZh/U7NyS0UZxQcJiCzt+cEcRvywbanWIZgu0SX 5pNRR3ZORbx0vYhO8CO6lY1fFPJSGca9pz57K5aZEStZPWwl48/CNtcgTyTpbBoTtNFc/2KeIZAZA vWWZ9ZOA==; Received: by zero.zsh.org with local id 1pgLkW-000HA1-1X; Sun, 26 Mar 2023 08:29:12 +0000 Authentication-Results: zsh.org; iprev=pass (mail-lf1-f54.google.com) smtp.remote-ip=209.85.167.54; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-lf1-f54.google.com ([209.85.167.54]:35760) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1pgLkG-000GrI-K5; Sun, 26 Mar 2023 08:28:57 +0000 Received: by mail-lf1-f54.google.com with SMTP id y20so7533345lfj.2 for ; Sun, 26 Mar 2023 01:28:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679819335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5ED3NHx+k/Xc2DAfcuezcXxsJstmx48ODrUqk1WDRMo=; b=en+1n0RlT8Mkgqdcx1yWvlgbQAa3XsPp4ZCy1H4BWPKStFm3Gr8hOYLmXBFEo/0C8j nbHcAWUmKt53RoV8Ly5Ow+yWuZtfYfsMxGf0RmkkHFdVlUl88tQkC9I1EF2FAWnxtK9C Z+pYxhzAWllaCQQ00fZ+mvBKPcomY6Md3lhlwK+S2mchEu236Y4KLumIzDGw8nUh1M2E S8RWCe7/X6uu0UBPrKnWHGoBEu/1sin+dL7+KidkJdLVoyu6WCXDn6kw1LI1dtYEVmqN 6mrCCsYjzQNpZIVD5uKTCT8g8gMoM6vvo9p5eNDUojpZFn+JiH7eJigdTGjFl6KlwctT Q9+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679819335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5ED3NHx+k/Xc2DAfcuezcXxsJstmx48ODrUqk1WDRMo=; b=tBt0AZSSZ1igB3apPhV6NlgVOIw2rOhmRqUdcxZm+zXAuxNFt569XXZalvKSC6ZgkL XYZBMBATCBT2y7zlHe/kRYQJRr1/oPZ3ewkEHjNsokPE0E11TKXGBeUSyEjru7775FzW Gil4Qa/of6vLxWY+wIrJnlqqeDeUcyRe9UP8GFYYhVFO9nKJOz/hs3Xqt2Gvs6gY+VWC BjiZ/OxusdJDfCzpfypAPXikU/8sP+bCEvLrZpOwpW9tlOMCK13ZtwkJYYanuya5WgLZ 2RTgtdL3uIxU1qSEj26aZBilA5FsRagtrjFTnQtdEQPstGdqol+m3EshiAT63RxJUP3k w9bQ== X-Gm-Message-State: AAQBX9eNRi+TfHwLPjfUmfbr3TMYI82Iuf2VWxRIZV0IsMrcqbat2yXb tPVzO9Z/V+xiD6wHKBkkafbBzxy7pFs= X-Google-Smtp-Source: AKy350ZBoJWdM1BkF0Tg47b3x9jueRgh1L99858G36vExXI2iruCQXGXaCOKnHNY+K7PzedgTc4lvg== X-Received: by 2002:ac2:520c:0:b0:4ea:e7ca:6e21 with SMTP id a12-20020ac2520c000000b004eae7ca6e21mr2295347lfl.6.1679819335351; Sun, 26 Mar 2023 01:28:55 -0700 (PDT) Received: from localhost.localdomain (h-94-254-94-11.A230.priv.bahnhof.se. [94.254.94.11]) by smtp.gmail.com with ESMTPSA id b6-20020a056512218600b004e8452972a2sm4158334lft.247.2023.03.26.01.28.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 01:28:54 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: Handle SIGIOT as an alias to SIGABRT if they are the same signal number Date: Sun, 26 Mar 2023 10:28:53 +0200 Message-Id: <20230326082853.10215-1-mikachu@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <3ac2df17-56b4-be10-b3ba-f27af8d1c47a@thatsmathematics.com> References: <3ac2df17-56b4-be10-b3ba-f27af8d1c47a@thatsmathematics.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 51602 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: There is already similar handling for SIGCLD/SIGCHLD and SIGIO/SIGPOLL (see 20566 and 20572), so extend this to handle SIGIOT and SIGABRT the same way. --- Src/jobs.c | 5 +++++ Src/signames2.awk | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Src/jobs.c b/Src/jobs.c index 2dfcefb33a..429ee2a326 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -2645,6 +2645,11 @@ static const struct { { "IO", SIGIO }, #endif #endif +#if defined(SIGABRT) && defined(SIGIOT) +#if SIGABRT == SIGIOT + { "IOT", SIGIOT }, +#endif +#endif #if !defined(SIGERR) /* * If SIGERR is not defined by the operating system, use it diff --git a/Src/signames2.awk b/Src/signames2.awk index 4d15681d58..4d1557cd8d 100644 --- a/Src/signames2.awk +++ b/Src/signames2.awk @@ -13,7 +13,8 @@ signam = substr(tmp[1], 4, 20) signum = tmp[2] if (signam == "CHLD" && sig[signum] == "CLD") sig[signum] = "" - if (signam == "POLL" && sig[signum] == "IO") sig[signum] = "" + if (signam == "POLL" && sig[signum] == "IO") sig[signum] = "" + if (signam == "ABRT" && sig[signum] == "IOT") sig[signum] = "" if (sig[signum] == "") { sig[signum] = signam if (0 + max < 0 + signum && signum < 60) @@ -33,9 +34,9 @@ if (signam == "IO") { msg[signum] = "i/o ready" } if (signam == "IOT") { msg[signum] = "IOT instruction" } if (signam == "KILL") { msg[signum] = "killed" } - if (signam == "LOST") { msg[signum] = "resource lost" } + if (signam == "LOST") { msg[signum] = "resource lost" } if (signam == "PIPE") { msg[signum] = "broken pipe" } - if (signam == "POLL") { msg[signum] = "pollable event occurred" } + if (signam == "POLL") { msg[signum] = "pollable event occurred" } if (signam == "PROF") { msg[signum] = "profile signal" } if (signam == "PWR") { msg[signum] = "power fail" } if (signam == "QUIT") { msg[signum] = "quit" } @@ -43,7 +44,7 @@ if (signam == "SYS") { msg[signum] = "invalid system call" } if (signam == "TERM") { msg[signum] = "terminated" } if (signam == "TRAP") { msg[signum] = "trace trap" } - if (signam == "URG") { msg[signum] = "urgent condition" } + if (signam == "URG") { msg[signum] = "urgent condition" } if (signam == "USR1") { msg[signum] = "user-defined signal 1" } if (signam == "USR2") { msg[signum] = "user-defined signal 2" } if (signam == "VTALRM") { msg[signum] = "virtual time alarm" } -- 2.38.1