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, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 32477 invoked from network); 12 Nov 2020 17:39:00 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 12 Nov 2020 17:39:00 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20200801; t=1605202740; b=Xb1/hhFLmwHCG8uYjdAx6aWs7Z4JQNeWLWvjbiwvOse0DUcbeIXt1R6tSm+eFnlFuzF6RKRRfO WVvL5lIHzdnCwSNHzUyOoLWsIbQAdrM30mBJKt1Xcr6CgGPb6eaojfiERnJPwM7RcEm/UFBTvI kp1UG8zcSOCuL3uilFY+K9LHvjTfrxE8XcQxN50fGpcOTgQ3Iiz1hdxX36OtW9YG5gk9WtTI5Z zOyt2BfcYNUG0GPcjUahsM3HtzC+EWKzzdD8sNXdtXA4YgrQVEHFyUdzpjMfMgec9d8YxiPYYt C52Mr1xbd1ij6BkhvDXbKjZWVP4zg7h+woYiGr4DguXkoQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-oi1-f194.google.com) smtp.remote-ip=209.85.167.194; dkim=pass header.d=gmail.com header.s=20161025 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-20200801; t=1605202740; bh=dgnBYAd1iFsf4FeCysHs6H6N7W457++8io/gPwkrvoQ=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:Message-ID:Date: Subject:Cc:To:From:DKIM-Signature:DKIM-Signature; b=cjWI3EKduCDB/CKoiIAQq+1Z+QXXbJIAu9ZHsvYPDSRoEY7/WIn8l1iTrWZxpNkiGu/FgjNqUj GvINaktFWoE7xlnUKPU7twEh6MfXEowDUbPH38w/jUUEDYP8/kwNbhnE0GHza9G3mYBYfK7Xa3 CMpyo9PLITUPLw1GAkmhE01yKMTVwH7Uf5ItErKN2dFImgInyKenbO8dcXutOYSp+xPn7LAwWf ahkSfxjTwKfmOaoh3jvT1e2XKucDHmue/lUpg8hnynJH+5+S/QSE3I52uOHK73skZvSnJQ6n3B WslH2H9D1LadJ8YLZkwfR7Q0lz8wd49f4rXXgRdIqumH+Q==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=rWYtBaKfJml0ElxnCcwGBKq4Wt5upknNBQ2Lj1M/0WU=; b=jVKcN08RwBkCWxp1nSWzfp6bFX yHUg+LSFCeyVHx8HEZ6foo7fP4WBmsFgfJyJBe7T26PrwiDH6yACCg/WT5f316CwOJR/4JboTuxg2 akNe/6BSZqTtuUfZqC1Agu2Khi5B2swMwi1Bu7Q8UP627lhQqsrFcjMrYyGcGtlAvXLIlg90mZk4v gkukr9B48HCNDyfooDISLkzl5Sju670LDNl8MUp0VHExpaCYEh7AEDHqkejPcHhqrgxcjg3mWFS6c V5JmdYkyPo3hqVNVRF19L9timA99Am8YLVFLrHAdANBpImL1CMzLP9PripGluHRdoPZSNCzaL1jI4 leoKwKeQ==; Received: from authenticated user by zero.zsh.org with local id 1kdGYb-000JFj-VU; Thu, 12 Nov 2020 17:38:49 +0000 Authentication-Results: zsh.org; iprev=pass (mail-oi1-f194.google.com) smtp.remote-ip=209.85.167.194; dkim=pass header.d=gmail.com header.s=20161025 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-oi1-f194.google.com ([209.85.167.194]:35365) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1kdGYF-000J5b-7P; Thu, 12 Nov 2020 17:38:28 +0000 Received: by mail-oi1-f194.google.com with SMTP id c80so7292582oib.2 for ; Thu, 12 Nov 2020 09:38:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rWYtBaKfJml0ElxnCcwGBKq4Wt5upknNBQ2Lj1M/0WU=; b=ZUlq5B5eazwIg/3oWYfPQJYvhY2NpQpvufkte5vX75mFZvjWrm9cOpxXy71ZskDqjR 8D9vU5qfBNZiNasjNEYKlpaKagBDf/7/Cqldr7hZkHbUdiSsYn60okKZQ8BH7X36tbuG Uq2VbsyHsv0NK7B3y6BPHPEkKiLlY//V0y2aUxevHEWVkaOD7ZtXy/P8N/o5zNx2J0xC rOgWyyoY56bBjRnWB96C+eD0P23wNKq/KiwMXFFL2InZul4Fz75XYEp7E+srhWmxemsW CTReusqdgnOdqi8LKZQ++TOsfIDfWiQ15CbwSvs5Yua8iSwTRAq1Movn9yGyXwGZT682 a3Qg== 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:mime-version :content-transfer-encoding; bh=rWYtBaKfJml0ElxnCcwGBKq4Wt5upknNBQ2Lj1M/0WU=; b=YufTvMp6M5izgqsI1L7rcoEQxnOJBKr0MVIez/5/tMlftcTfpL2C7A4ERZ4Rnac9zm AgM5eouQ+SIjqIX4e6G+LjyLw2MNfe86H1X8Nsi+GUdBAfXVmJ4g01/nQvpVVYhG1d4N P6bCrrl6qR+iRbEftb3cW1lb/70lOHhdBMnYVdxQiXeo1daxBU/7czYr4Hwd6b36LbrP XiWefHfGx9SjxUd42bLeLrlOU3r4NbUl/IIjydaZiP07ift1RmoNLOtb3wMrScfo2Hiv og2rPb5RSVOuJOMJ1vgTi2QZxWdcFQktpRe8P2vd1LzqNoNzSsJIBIpAsV7fMKGfwC7l KdaA== X-Gm-Message-State: AOAM531ub8VUi2+aY3Tn2qNe5+JAqulaqDUcsOi7YFFSaN6H8QW31vs1 +EDElMBtsW3XMX4V/NY4JCyU17u1zPdD2Q== X-Google-Smtp-Source: ABdhPJxzpzJSTP78E59BKvsMX1V7nq7bEd4uKAFdWLpKOIiymxjo7b8uh1ReJUOMiJIcoyxiCvj9zA== X-Received: by 2002:aca:ec55:: with SMTP id k82mr533304oih.146.1605202705424; Thu, 12 Nov 2020 09:38:25 -0800 (PST) Received: from localhost (189-209-26-110.static.axtel.net. [189.209.26.110]) by smtp.gmail.com with ESMTPSA id v21sm1355913ota.78.2020.11.12.09.38.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 09:38:24 -0800 (PST) From: Felipe Contreras To: zsh-workers@zsh.org Cc: Felipe Contreras Subject: [PATCH] builtin: trivial cleanup Date: Thu, 12 Nov 2020 11:38:22 -0600 Message-Id: <20201112173822.1500674-1-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 47546 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: Archived-At: The flags were being set in exactly the same way in both branches of the condition. Signed-off-by: Felipe Contreras --- Src/builtin.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Src/builtin.c b/Src/builtin.c index 09eb3728c..5d780e4ca 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -2231,17 +2231,12 @@ typeset_single(char *cname, char *pname, Param pm, UNUSED(int func), arrfixenv(pm->node.nam, x); } } - if (usepm == 2) /* do not change the PM_UNSET flag */ - pm->node.flags = (pm->node.flags | (on & ~PM_READONLY)) & ~off; - else { - /* - * Keep unset if using readonly in POSIX mode. - */ - if (!(on & PM_READONLY) || !isset(POSIXBUILTINS)) - off |= PM_UNSET; - pm->node.flags = (pm->node.flags | - (on & ~PM_READONLY)) & ~off; - } + /* + * Keep unset if using readonly in POSIX mode unless specified otherwise. + */ + if ((usepm != 2) && !((on & PM_READONLY) && isset(POSIXBUILTINS))) + off |= PM_UNSET; + pm->node.flags = (pm->node.flags | (on & ~PM_READONLY)) & ~off; if (on & (PM_LEFT | PM_RIGHT_B | PM_RIGHT_Z)) { if (typeset_setwidth(cname, pm, ops, on, 0)) return NULL; -- 2.29.2