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=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 22184 invoked from network); 25 Jul 2023 05:54:27 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 25 Jul 2023 05:54:27 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1690264467; b=UJSCZDj4jHoVO8N9g/5EB9kdM7+yg66Y1YWHhAjzRt6G4tW9cWLuOit3/0U0GJ3QrxCiJbEe0V rQictl1AixMyeTMOC+xTit11XJdqRrm6YqgctgoPlPwtI23D+VBbPclvynl7+me4KG8VA9wxfc zCghRjvUPGyNiwDfbGiK08GiVtKfkVSIHZUoSCHUkFl9HY7Xo8T2aikK2lsGgEebSd5xIu30BI 1IJkrkLn9eiwKOR+WztYHhj4bZcqo6mDLpQ8gRhzMJD65b/vpg/wyOqijlu3le1krcHEVSoxNC A/a6wyn+H25WlZNoRdh4mvGg2KeA5kb1/sHGRbnFyZu8Zw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f45.google.com) smtp.remote-ip=209.85.218.45; dkim=pass header.d=brasslantern-com.20221208.gappssmtp.com header.s=20221208 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=1690264467; bh=TVihFrqBb7ltxzW2qfCji0L4f1uS+ctsV1hCs8GjtPg=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:To:Subject:Message-ID:Date:From:MIME-Version: DKIM-Signature:DKIM-Signature; b=oJzzf7UIKsDj3qHvp0v4jq3cP69w8QnsGQIYKB7gaInKmLNkMTivtmQRwzPaQk1x4vfzrWy3kU mbjPBLLr0W0t+ByVdw9T9kCBPgSFstGNQR8I14wGCJHBEVaLsHaRnCcBc1u53tVex+bSrxfRzp 3sVrhZBQ2XxY+K1BMw3Rh93Nct+Sxg6nw/qqkbJ526fV9RuojSuVwXkWX2aI6Rr862xiB6RWFc Dnt6hhc5FWkEZtHCSG7P3UC7epmd68jQVRPxW83eowh9ShUCGz5og2VWJ0/KIDiJyraNUMmkAX 9vAmvr8pPVf9A7T9LSBlI776mcLjyudOFbYoLtthfSm+qg==; 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: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:In-Reply-To:References; bh=TVihFrqBb7ltxzW2qfCji0L4f1uS+ctsV1hCs8GjtPg=; b=L6mEUGHLlSWAKsbBugYj75pkR8 jJ7cON3lO5Urn47WGH1/ICmuvwuDNTgYHTQddA6NJIFTvTyK6q+peijwJJ4fsvPkEUbfAyQVV3yEw 9yVsvzSSmWjrpfMROtwRglM9PmQd5cA/4OfsZl7OLpUtXozZCUAb/cDFvN5cYPeYm4EPGCM9yYd5b f00+l6UQiAVkrJo6bdLNga5tWkMleUwyg3wF7pVdaXpyoGq4Mz4lzQkqWFCTdPZd3q7r/TEQP+HCO qqvLLKpzxdyusBxptYyFaTMMwispDgd7fljFlled5wzFcrJmglWyuDQNYSSTANyBDOogNfbb/TnOp r6JoS45A==; Received: by zero.zsh.org with local id 1qOB05-000MEP-Mk; Tue, 25 Jul 2023 05:54:25 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f45.google.com) smtp.remote-ip=209.85.218.45; dkim=pass header.d=brasslantern-com.20221208.gappssmtp.com header.s=20221208 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-ej1-f45.google.com ([209.85.218.45]:59409) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1qOAzk-000Lwi-Dr; Tue, 25 Jul 2023 05:54:05 +0000 Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-98dfb3f9af6so877545966b.2 for ; Mon, 24 Jul 2023 22:54:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20221208.gappssmtp.com; s=20221208; t=1690264444; x=1690869244; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=TVihFrqBb7ltxzW2qfCji0L4f1uS+ctsV1hCs8GjtPg=; b=sTuDq0wfHbYhjWnm8QtVSX+3IoyZQ0NVLdr9+xyye2aX0qedVwY3i1+KIaadQyMlHT adEjxzQOnCv8DLylXxbWJxtvQRmfSVqS8vZiNaXYKKTYdcc28TCEjDIvxalKKvkczkVR zWOjiFm6oh9TR3SNxDXlO+bsnBZchfOnwMOZ2qX5vjjNDrDVY/An1NjWy4trxv+LuzPp cVZKZd4C9qlthIXOU+on4IA/wUmgl6thyVVpmxT9dCvMBXJAqZK/kL/jFiODW7MOnEQd UXFGDM1pw/AXXzGZ9Tt7eZW6hPMthKyPJeSEouYwc80rbmN4Yt5tVrWVV1+4o7mY25lk u1ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690264444; x=1690869244; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TVihFrqBb7ltxzW2qfCji0L4f1uS+ctsV1hCs8GjtPg=; b=U1pXjtEbAyrwMWRxsRydy4V1eqWq6/qd9BWoQ+ThcNLyhPzMEIl7Y2hRjnnKpvEz2N 3aCd9Lhx6S//Q0oo5yrRwfDZRfHWteSc4HtkroTV5avTIam84HDn/LfWsOH36wJgG6+/ B8aNgDghF+N409yLdeHkc2MuBZc/hjEyGX0O4AqiA9nF9YpkZYileLuMTMTvJrJyj1Vb ynS+UuNTZM57O0a9gmoPKvkQkbKbGh3rzUCow8n1bvhZoYVr3qV8qG2vdtLQnoqA4L33 IgJRsqWn0S+35a8Tbbh0Hv5YFhG0nHBpKPWYQSa/9cT6S1gtfwlW+hqSYvWgiMwqYMsG T+Sg== X-Gm-Message-State: ABy/qLYfw5Gq6oAdDml2IHpwDFF4r6/9wXW53+toP8N685zanVj4OLz2 1q9SiJP5O42Xcj9bqlOj2uwRXI01JyI+45MFBMZIrjMBpQTJDS16q0Y= X-Google-Smtp-Source: APBJJlHteNrje5/J0R8B/mz3khbB6L4xD89tIkCYkxZUgkmUT9Ng8G2+lLh8ZFTuWmBPhqpm9toDzwkIcjk8PvlFD0A= X-Received: by 2002:a17:906:1059:b0:993:d6e8:2389 with SMTP id j25-20020a170906105900b00993d6e82389mr13556495ejj.26.1690264443449; Mon, 24 Jul 2023 22:54:03 -0700 (PDT) MIME-Version: 1.0 From: Bart Schaefer Date: Mon, 24 Jul 2023 22:53:52 -0700 Message-ID: Subject: [PATCH] fix other nofork substitution bugs revealed by tests To: Zsh hackers list Content-Type: multipart/mixed; boundary="000000000000bab4ca0601495ba9" X-Seq: 51987 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: --000000000000bab4ca0601495ba9 Content-Type: text/plain; charset="UTF-8" As alluded to in workers/51957, nearly all of this is about getting the PS2 stack right. This applies on top of, and partly reverses, the lex.c hunk of, workers/51985. --000000000000bab4ca0601495ba9 Content-Type: text/plain; charset="US-ASCII"; name="nofork-tested2.txt" Content-Disposition: attachment; filename="nofork-tested2.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lkhvqh410 ZGlmZiAtLWdpdCBiL1NyYy9sZXguYyBhL1NyYy9sZXguYwppbmRleCAzMjNmOGI2YWMuLjFiNjc4 Nzk0YSAxMDA2NDQKLS0tIGIvU3JjL2xleC5jCisrKyBhL1NyYy9sZXguYwpAQCAtMTQyMSw4ICsx NDIxLDExIEBAIGdldHRva3N0cihpbnQgYywgaW50IHN1YikKICAgYnJrOgogICAgIGlmIChlcnJm bGFnKSB7CiAJaWYgKGluX2JyYWNlX3BhcmFtKSB7Ci0JICAgIHdoaWxlKGJjdC0tID49IGluX2Jy YWNlX3BhcmFtKQorCSAgICB3aGlsZShiY3QgPj0gaW5fYnJhY2VfcGFyYW0pIHsKKwkJaWYgKGJj dC0tID09IGNtZHN1YnN0KQorCQkgICAgY21kcG9wKCk7CiAJCWNtZHBvcCgpOworCSAgICB9CiAJ fQogCXJldHVybiBMRVhFUlI7CiAgICAgfQpAQCAtMTQzMCw4ICsxNDMzLDExIEBAIGdldHRva3N0 cihpbnQgYywgaW50IHN1YikKICAgICBpZiAodW5tYXRjaGVkICYmICEobGV4ZmxhZ3MgJiBMRVhG TEFHU19BQ1RJVkUpKQogCXplcnIoInVubWF0Y2hlZCAlYyIsIHVubWF0Y2hlZCk7CiAgICAgaWYg KGluX2JyYWNlX3BhcmFtKSB7Ci0Jd2hpbGUoYmN0LS0gPj0gaW5fYnJhY2VfcGFyYW0pCisJd2hp bGUoYmN0ID49IGluX2JyYWNlX3BhcmFtKSB7CisJICAgIGlmIChiY3QtLSA9PSBjbWRzdWJzdCkK KwkJY21kcG9wKCk7CiAJICAgIGNtZHBvcCgpOworCX0KIAl6ZXJyKCJjbG9zaW5nIGJyYWNlIGV4 cGVjdGVkIik7CiAgICAgfSBlbHNlIGlmICh1bnNldChJR05PUkVCUkFDRVMpICYmICFzdWIgJiYg bGV4YnVmLmxlbiA+IDEgJiYKIAkgICAgICAgcGVlayA9PSBTVFJJTkcgJiYgbGV4YnVmLnB0clst MV0gPT0gJ30nICYmCkBAIC0xNDY4LDcgKzE0NzQsNyBAQCBzdGF0aWMgaW50CiBkcXVvdGVfcGFy c2UoY2hhciBlbmRjaGFyLCBpbnQgc3ViKQogewogICAgIGludCBwY3QgPSAwLCBicmN0ID0gMCwg YmN0ID0gMCwgaW50aWNrID0gMCwgZXJyID0gMCwgY21kc3Vic3QgPSAwOwotICAgIGludCBjOwor ICAgIGludCBjLCBic2tpcCA9IDA7CiAgICAgaW50IG1hdGggPSBlbmRjaGFyID09ICcpJyB8fCBl bmRjaGFyID09ICddJyB8fCBpbmZvcjsKICAgICBpbnQgemxlbWF0aCA9IG1hdGggJiYgemxlbWV0 YWNzID4gemxlbWV0YWxsICsgYWRkZWR4IC0gaW5idWZjdDsKIApAQCAtMTU0MSwxOSArMTU0Nywy MiBAQCBkcXVvdGVfcGFyc2UoY2hhciBlbmRjaGFyLCBpbnQgc3ViKQogCSAgICBpZiAoY21kc3Vi c3QgJiYgIWludGljaykgewogCQkvKiBJbiBub2Zvcmsgc3Vic3RpdHV0aW9uLCB0b2tlbml6ZSBh cyBpZiB1bnF1b3RlZCAqLwogCQljID0gSW5icmFjZTsKLQkJYmN0Kys7CisJCWJza2lwKys7CiAJ ICAgIH0KIAkgICAgYnJlYWs7CiAJY2FzZSAnfSc6CiAJICAgIGlmIChpbnRpY2sgfHwgIWJjdCkK IAkJYnJlYWs7CiAJICAgIGMgPSBPdXRicmFjZTsKKwkgICAgaWYgKGJza2lwKSB7CisJCWJza2lw LS07CisJCWJyZWFrOworCSAgICB9CiAJICAgIGlmIChiY3QtLSA9PSBjbWRzdWJzdCkgewotCQlj bWRwb3AoKTsKIAkJY21kc3Vic3QgPSAwOwotCSAgICB9Ci0JICAgIGlmIChjbWRzdWJzdCA9PSAw KQogCQljbWRwb3AoKTsKKwkgICAgfQorCSAgICBjbWRwb3AoKTsKIAkgICAgYnJlYWs7CiAJY2Fz ZSAnYCc6CiAJICAgIGMgPSBRdGljazsKQEAgLTE2MDksNyArMTYxOCw3IEBAIGRxdW90ZV9wYXJz ZShjaGFyIGVuZGNoYXIsIGludCBzdWIpCiAJYWRkKGMpOwogCWlmICghY21kc3Vic3QgJiYgYyA9 PSBJbmJyYWNlKSB7CiAJICAgIC8qIENoZWNrIGZvciAke3wuLi59IG5vZm9yayBjb21tYW5kIHN1 YnN0aXR1dGlvbiAqLwotCSAgICBpZiAoKGMgPSBoZ2V0YygpKSkgeworCSAgICBpZiAoKGMgPSBo Z2V0YygpKSAmJiAhbGV4c3RvcCkgewogCQlpZiAoYyA9PSAnfCcgfHwgaW5ibGFuayhjKSkgewog CQkgICAgY21kc3Vic3QgPSBiY3Q7CiAJCSAgICBjbWRwdXNoKENTX0NVUlNIKTsKQEAgLTE2MjMs MTAgKzE2MzIsMTggQEAgZHF1b3RlX3BhcnNlKGNoYXIgZW5kY2hhciwgaW50IHN1YikKICAgICBp ZiAoaW50aWNrKSB7CiAJY21kcG9wKCk7CiAgICAgfQotICAgIGlmIChiY3QgJiYgYmN0ID09IGNt ZHN1YnN0KQotCWNtZHBvcCgpOwotICAgIHdoaWxlIChiY3QtLSkKKyAgICB3aGlsZSAoYmN0KSB7 CisJaWYgKGJjdC0tID09IGNtZHN1YnN0KSB7CisJICAgIC8qCisJICAgICAqIFlvdSB3b3VsZCB0 aGluayB0aGlzIGlzIGFuIGVycm9yLCBidXQgaWYgd2UgY2FsbCBpdCBvbmUsCisJICAgICAqIHBh cnNlc3Rybm9lcnIoKSByZXR1cm5zIG5vbnplcm8gdG8gc3Vic3RfcGFyc2Vfc3RyKCkgYW5kCisJ ICAgICAqIHN1YnNlcXVlbnRseSAiYmFkIHN1YnN0aXR1dGlvbiIgaXMgbm90IHJlcG9ydGVkCisJ ICAgICAqLworCSAgICAvKiBlcnIgPSAxICovCisJICAgIGNtZHBvcCgpOworCX0KIAljbWRwb3Ao KTsKKyAgICB9CiAgICAgaWYgKGxleHN0b3ApCiAJZXJyID0gaW50aWNrIHx8IGVuZGNoYXIgfHwg ZXJyOwogICAgIGVsc2UgaWYgKGVyciA9PSAxKSB7Cg== --000000000000bab4ca0601495ba9--