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.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 6310 invoked from network); 9 Jun 2022 03:24:48 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 9 Jun 2022 03:24:48 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1654745088; b=YoWj+pctHghhoQQzmersPLTdwirzEx/Mlk2LXf/tVT8OOaYjrg7j2kZuCcApHbN41Wuho4bNNA 5N4CR+wwM94Z11Ifo8GGEjOVliCnpg12rLiDQeDNbn/2o7vg5adfUrXKDWTPiyr2/RHK69s+so v5Co3wJnW48e3T8iP+8xRFTEc6Q/2SzaY8G2g4nYchX3++Rt/1pi17WOHanW6YsDOQmJADMqHR o+Kkk8X76Z/i7fQQdhCNjQX/qnNBGv5ZUYzlsMiw3zvJUCDS9fwRMhRThr1IGL9+3p1UqRygY/ oCtQaWWURgqt548ookavnvGopNgRVsgKzu3AtETORadsPg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f54.google.com) smtp.remote-ip=209.85.218.54; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1654745088; bh=oKHcWTOsvgtOjam7iO12dECFg1F014b+VmNx4v1Ps4s=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:DKIM-Signature:DKIM-Signature; b=rdQNA+RVxNjwhUv/t0+YJi50+WkbYX15X+fTrAcSWYVynKrJIo/1d/Ab7OBSXLqVQe1Ko07sxQ j9W+7hoq1Ra2sOq5DZKIQgrrXlgPTJO1Oy0onHWj81cqGd7rHf0goyFHw+HuFRq7gICw8gq5Aq dsEbN9+Kvg0AKcXlmtnYKa+jIez8NbrPlzGOppXTlJ8QdFNep1xwROJaoUKH/Fxtf835Q+B1NM o+BA8hjA71hb/2nJREDJ7wIWz5qGu/q+KRnWsyW5KpI0HufQShLRqXIRfw0vcrL9/5g3+7KX0d UILFiqDaAOueenKv2vzYfMAmxnnw8xKB+Dx9l8vZoYCknw==; 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-Type:To:Subject:Message-ID: Date:From:In-Reply-To:References:MIME-Version:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=GNEMpKIr5mVPLQu3/ZsuIjF7/H3bfMRH18BDcAyl4ZU=; b=cn+HC6KnM2XQu3dT2u/QSl40FT B6Kfj9VE1lmk9sszxT7sHRNRGAHpPeX/2tcptL7sh5E4plbRKUe7fleUsoruc16FhLT7Pr3rMKp2x nZF8nAIYykgVkYbKynpiuKUCO22pyWS2/X/IimTamVyYjyn40f4G/60hDrBLCTg1wE+BZ2ETRb40r RfwVgkopZCDc0CXmmUuxlyhQHnGaql9QevLfNk/3MnJnwU2XktTy8wL8t3HaTEt3IS/reibBufMC+ WUC9PovkjDWpsBWt3bYS+8/YegmSItRE2SNt0SmwCebD3X1EeHxUOWFrretaw5y1Xd5dl/Sy86yuZ kRedYMLQ==; Received: from authenticated user by zero.zsh.org with local id 1nz8mt-000H2C-ON; Thu, 09 Jun 2022 03:24:47 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f54.google.com) smtp.remote-ip=209.85.218.54; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-ej1-f54.google.com ([209.85.218.54]:39761) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1nz8mZ-000Gfu-H2; Thu, 09 Jun 2022 03:24:27 +0000 Received: by mail-ej1-f54.google.com with SMTP id y19so44937334ejq.6 for ; Wed, 08 Jun 2022 20:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=GNEMpKIr5mVPLQu3/ZsuIjF7/H3bfMRH18BDcAyl4ZU=; b=XUzjYcTnOvF7sd6EUZlAqF4HaBZQ3sefTyJi1duvxChOaLW6KefGPA2fvvskg4I3Sv kUyKL5COxhWd6w08FY1RPx2LzlYMuSy8ZtKvNNnhL22BTCXEAxtO9Y0EL1EOxWcjq3v0 mXuSLcX0YqInljmL1HlI4SHLauEauzWHLlJicG3RaWyjm4rQhI2SPANef0n7rkIfP6nX qMo3s5VdEF0vlRrXcGCPMi+duaAO8/wARtRLCLeKkobOHcTcGWOeF4X74gKMepiqX3CM ONMIsG/YT1Xp8nIWHVaIANissTmTqOaa9atJEN21TwS4TnNwpVPFsuCdqctkaKpCdsB9 a7jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=GNEMpKIr5mVPLQu3/ZsuIjF7/H3bfMRH18BDcAyl4ZU=; b=PwbHf/WeCDIg0qUzezk8Qnfi1O0F76WZKJTkKL3ruLHXxwGTpKkzrvP8ORv9oFsMcq 7f4MKv1Hg9XITrxM6xeQuGE5FWeQgmMBcJX5O8VeuodjWBNAXBdbZOiG1yh+aGahkd7j vpte2xxIjynaiuy+pLGh546JXZsyRoZuOshHhTY0i9szuvEyw2rT1DxZh0ZI4x5A2bIQ MbLptOVSVqkoLNMdcbACGBrpeUrS8MujxWjbT3QAWtfUgyQeVhEMx3mYwDkQPBUqZJgu ByaB97Np7OGEOMaWNnJfUqg04dtTE85jJgxSEcfZxNBokchEdPE5z/UuljrrcsR4j3ZE XELg== X-Gm-Message-State: AOAM533+++yDntiV6xBlWBEwwMVh8U0rWkKvBvgVjmWfR9/TNpaJqArG 6NJJ9yDXwFqMOOl31kxdYXjZwJI9wKYoUYOhsPFPLCG+EmSSCg== X-Google-Smtp-Source: ABdhPJxGyUm1G7wlK+KpTrSB1G6Yln1/g444B+5Lds8UuyFWUpTRS/O1HUdE0zn7GE0TbURuF08GBVoYf5stirwSyHg= X-Received: by 2002:a17:907:1612:b0:711:e427:e9bc with SMTP id hb18-20020a170907161200b00711e427e9bcmr9707217ejc.55.1654745067152; Wed, 08 Jun 2022 20:24:27 -0700 (PDT) MIME-Version: 1.0 References: <1148576327.671240.1654595869665@mail2.virginmedia.com> In-Reply-To: From: Bart Schaefer Date: Wed, 8 Jun 2022 20:24:15 -0700 Message-ID: Subject: Re: "functions -c" and TRAPxxx To: Zsh hackers list Content-Type: text/plain; charset="UTF-8" X-Seq: 50351 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: On Tue, Jun 7, 2022 at 7:57 AM Bart Schaefer wrote: > > I know most of what's going on there, but "functions -c" is creatin > an alternate name, and there is also the failure case of settrap() > returning nonzero to handle. The following works for the case of settrap() succeeding, but I'm not sure how to force settrap() to fail. diff --git a/Src/builtin.c b/Src/builtin.c index 1cef7cce8..7f00d9d29 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -3274,6 +3274,7 @@ bin_functions(char *name, char **argv, Options ops, int func) if (OPT_ISSET(ops,'c')) { Shfunc newsh; + char *s = argv[1]; if (!*argv || !argv[1] || argv[2]) { zwarnnam(name, "-c: requires two arguments"); return 1; @@ -3305,7 +3306,21 @@ bin_functions(char *name, char **argv, Options ops, int func) newsh->redir->nref++; if (shf->sticky) newsh->sticky = sticky_emulation_dup(sticky, 0); - shfunctab->addnode(shfunctab, ztrdup(argv[1]), &newsh->node); + /* is newsh a signal trap? (adapted from exec.c) */ + if (!strncmp(s, "TRAP", 4)) { + int signum = getsignum(s + 4); + if (signum != -1) { + if (settrap(signum, NULL, ZSIG_FUNC)) { + freeeprog(newsh->funcdef); + dircache_set(&newsh->filename, NULL); + zfree(newsh, sizeof(*newsh)); + return 1; + } + /* Remove any old node explicitly */ + removetrapnode(signum); + } + } + shfunctab->addnode(shfunctab, ztrdup(s), &newsh->node); return 0; }