From owner-dev-commits-src-main@freebsd.org Sun May 9 16:06:19 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E65763BB54; Sun, 9 May 2021 16:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FdTZM2flbz3Pxc; Sun, 9 May 2021 16:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4E719147C1; Sun, 9 May 2021 16:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 149G6JqW002332; Sun, 9 May 2021 16:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 149G6Jdh002331; Sun, 9 May 2021 16:06:19 GMT (envelope-from git) Date: Sun, 9 May 2021 16:06:19 GMT Message-Id: <202105091606.149G6Jdh002331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 8725f0b9dbd2 - main - Revert "getty: push assignment to inner block." MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8725f0b9dbd296ca93f0f19c51940a46a98dcb2d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 May 2021 16:06:19 -0000 The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8725f0b9dbd296ca93f0f19c51940a46a98dcb2d commit 8725f0b9dbd296ca93f0f19c51940a46a98dcb2d Author: Xin LI AuthorDate: 2021-05-09 16:05:52 +0000 Commit: Xin LI CommitDate: 2021-05-09 16:05:52 +0000 Revert "getty: push assignment to inner block." This reverts commit c7b8bc367f18210d233b0e2185b5ce0d55c9ccaa. Pointed out by: trasz --- libexec/getty/subr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index b8f359355afc..9958d193aa60 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -564,8 +564,8 @@ makeenv(char *env[]) strlcat(termbuf, TT, sizeof(termbuf)); *ep++ = termbuf; } - if (EV) { - p = EV; + if ((p = EV)) { + q = p; while ((q = strchr(q, ','))) { *q++ = '\0'; *ep++ = p;