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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 11195 invoked from network); 3 Mar 2022 22:59:34 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 3 Mar 2022 22:59:34 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1646348374; b=pbr7NyuLngg8EsdCsaUAVKaG6OPFYVjuMkShpgHxSZtTmFU6zfjZKGsFjMDHJ700EEXWcIZG8L Tz/ZbCm9B5flW4QBdCJXUZ9r5d30QQcD/qWg8D/osWMnSVRjWPaqQ/SCwzxRXWQm6Ae1OOy83u nrgOgrVzmF6yMuGzJgUSai7ruWkCxoLIlOjR2ar1iTY3vAZAWTXlbSxtg9xbwhMHVtC1JByf4x 2Qz+u5E6RWsWVhnoB1tS8ulEB0ZM/HZ15OF6FjRRkGQDfCtU0b/uOujFbBGUNBVCQja/EMipdh Vf3wexdss3VBJlMXc231TTRZHutqjpTf1taqELB31bDO8Q==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (us-smtp-delivery-124.mimecast.com) smtp.remote-ip=170.10.133.124; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.a=rsa-sha256; dmarc=pass header.from=redhat.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1646348374; bh=bgbWigecbCD/QDZMI0vm7s2z/FuFLs0/3jetQSEGawg=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Date:To:From:Subject:Message-ID:DKIM-Signature: DKIM-Signature; b=AS8EyAeOARtxgrW057nskPR3YeEwgAEmTynAy0QEHo0U+zs4tkHH2NFoLypVorj+7Kxx0ftjHH NbN8VDnWs+pAucZqmf0RS0dDXAWo3wKgUnCW/Nfv9UqUFk/K9cMgXnBO6+159yHJ4dUhHUh5S3 f+zpo4KQ4mWT2hmdUXNLnO+vLCJiodnY87WE0lzKTGh0QN3tmILg3/qPHrdzY/YgI0psGlVWKs oV5J72q4HGXGU/vFP9QqYu2p7LN/eqCNQGW+NBbTWpEWYpqNAU1pODmRapIuqgcGCm9IsyvWlr r2H0n0do5Etvvhuo9ju/d/40LCEZVViZmRp989GN76KHZQ==; 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: Content-Type:MIME-Version:References:In-Reply-To:Date:To:From:Subject: Message-ID:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=hnCwlOHnZXf9DgFcWVhDEoGS97AFF6Xi2SUfor9XQQ8=; b=WRileSG/Ck7EtagMCAoyBhlwhr wjx2vDiuNRWyaJJvSScHEMavtr8Umby/DcscJYgRaqzEgBDrcCRWNtt+u+wQ1T0jTHiokOWPKZ+Xd nmkZBI46UTKbEZXhEEAv4PyEat1LuJEmUZhKSsNTz8jWu65nFIbL7xP28JvgbFIb3FyL651pxDzN5 Loxcwp2HWFbJMz2lC34Rry8i9evZY16CGSOF4LHFk7IMJ6G7rTEPAW7EyDU7DEwQU8/G5380V1LzJ tv1hjVs0s9Zcxdf+1tJ80tWAcFm/HTHinKtYttkR524KKgaFtSn8DA1GPKBfjQG6WzD1BsSd3rXpe LTGu7Emw==; Received: from authenticated user by zero.zsh.org with local id 1nPuQ1-000OMb-Gu; Thu, 03 Mar 2022 22:59:33 +0000 Authentication-Results: zsh.org; iprev=pass (us-smtp-delivery-124.mimecast.com) smtp.remote-ip=170.10.133.124; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.a=rsa-sha256; dmarc=pass header.from=redhat.com; arc=none Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21624) by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) id 1nPuPg-000O1g-VO; Thu, 03 Mar 2022 22:59:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646348351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hnCwlOHnZXf9DgFcWVhDEoGS97AFF6Xi2SUfor9XQQ8=; b=cq1+ixFCBHzEsKWlFgmLO8tx3A9o6EdsnF8WbnqPsT6p8QpPS4kjq4XaKxu6StKsgNlUE0 r/9ZtmYtim+9cN8UUWfcoC7edWinKMQfLcBxDP0SZE2A0aJWexz51tsIkGa5YlZ70GJwIf l9UgojiNc7z2Q5oR8rXh+/ctJsYbQig= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-594-IJda6gy4MYiWkG7OMHVdgw-1; Thu, 03 Mar 2022 17:59:09 -0500 X-MC-Unique: IJda6gy4MYiWkG7OMHVdgw-1 Received: by mail-qv1-f71.google.com with SMTP id b3-20020a056214134300b004352de5b5f0so3925236qvw.20 for ; Thu, 03 Mar 2022 14:59:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:organization:user-agent:mime-version :content-transfer-encoding; bh=hnCwlOHnZXf9DgFcWVhDEoGS97AFF6Xi2SUfor9XQQ8=; b=tm0YQ1O9aBs8fIQyCWEXbjoAPSuk8YtQoTi105EHELbVTDe8/nUSHT26eahogdv2AD g5Cw9hjQkdUyEN3h1gWo2WXsMf52tpTOzQVlxQZIedITX93MxYlhPvJYBvBgLvJxVJ// YiPNsNJi+yBBFaNcisDcsJRunPTxkZtjNvq9b8rRaE9JjRE+y9npbHdv1FWk35L7F8SU SCOgD0oyAQkKi6xET3VlBht/CZJ34cvApxxoOe0HAmP87tJDwmLcuWxJ8BplUHambuQY EEoe9sdqTAgz2Iotk/KgwZaq5Ok5q+ql2vHN/qWfArEdtXUGeKOtA1N33Eqw0ojtFAK3 49sw== X-Gm-Message-State: AOAM531DLOsYvnxdCMti3PdYRqaxKZ214ujFgD9AfJ1JfSiU33EYvvyW Es7mNAAUYGEZ0bXyba+B8pWJ2gzjHpnVtKkKRFgAC/3ysp4nSR8tcvnE+MihpeiBXxdwO78gQtS 9QbKjtYcIsQgv X-Received: by 2002:a05:620a:208c:b0:648:c292:231c with SMTP id e12-20020a05620a208c00b00648c292231cmr880303qka.714.1646348349186; Thu, 03 Mar 2022 14:59:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJy0skiShEmRqZIJZllpCIFpFYfmlXB9vnVFBejz6y9uL/RRPURIqseoRd9toHCp3PJ5hDW+wA== X-Received: by 2002:a05:620a:208c:b0:648:c292:231c with SMTP id e12-20020a05620a208c00b00648c292231cmr880295qka.714.1646348348954; Thu, 03 Mar 2022 14:59:08 -0800 (PST) Received: from [192.168.8.138] (pool-96-230-100-15.bstnma.fios.verizon.net. [96.230.100.15]) by smtp.gmail.com with ESMTPSA id k8-20020a05620a138800b00679fc7566fcsm282001qki.18.2022.03.03.14.59.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 14:59:08 -0800 (PST) Message-ID: <7c308c80f3b12d52ff9031999810f076c9051558.camel@redhat.com> Subject: Re: Regression with stdin handling in non-interactive mode between 5.8 and 5.8.1 From: Lyude Paul To: Peter Stephenson , zsh-workers@zsh.org Date: Thu, 03 Mar 2022 17:59:07 -0500 In-Reply-To: <1630957415.1168113.1646308359498@mail2.virginmedia.com> References: <5e9cdfc2b807bfc4aa4695938b70156742c2e120.camel@redhat.com> <142189641.1163040.1646300345691@mail2.virginmedia.com> <1630957415.1168113.1646308359498@mail2.virginmedia.com> Organization: Red Hat Inc. User-Agent: Evolution 3.42.4 (3.42.4-1.fc35) MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lyude@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Seq: 49796 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: Woo - seems to fix the problem on my end! :) Don't know if y'all use these, but feel free to consider this patch: Tested-by: Lyude Paul On Thu, 2022-03-03 at 11:52 +0000, Peter Stephenson wrote: > diff --git a/Src/input.c b/Src/input.c > index caeaff0e3..50cd2cd78 100644 > --- a/Src/input.c > +++ b/Src/input.c > @@ -223,13 +223,20 @@ shingetchar(void) >         return STOUC(*shinbufptr++); >   >      shinbufreset(); > -    do { > +    for (;;) { >         errno = 0; > -       nread = read(SHIN, shinbuffer, SHINBUFSIZE); > -    } while (nread < 0 && errno == EINTR); > -    if (nread <= 0) > +       nread = read(SHIN, shinbufendptr, 1); > +       if (nread > 0) { > +           /* Use line buffering (POSIX requirement) */ > +           if (*shinbufendptr++ == '\n') > +               break; > +           if (shinbufendptr == shinbuffer + SHINBUFSIZE) > +               break; > +       } else if (nread == 0 || errno != EINTR) > +           break; > +    } > +    if (shinbufendptr == shinbuffer) >         return -1; > -    shinbufendptr = shinbuffer + nread; >      return STOUC(*shinbufptr++); >  } >   > diff --git a/Test/A01grammar.ztst b/Test/A01grammar.ztst > index 4e39a8f3c..0312fe94e 100644 > --- a/Test/A01grammar.ztst > +++ b/Test/A01grammar.ztst > @@ -961,3 +961,12 @@ F:Note that the behaviour of 'exit' inside try-list > inside a function is unspeci >  F:This test was written to ensure the behaviour doesn't change silently. >  F:If this test fails during development, it *might* be appropriate to > change >  F:its expectations. > + > + ( > +   export VALUE=first > +   print -l 'echo Value is $VALUE' 'VALUE=second sh' 'echo Value is $VALUE' > | > +   $ZTST_testdir/../Src/zsh -f > + ) > +0:Non-interactive shell command input is line buffered > +>Value is first > +>Value is second -- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat