From nobody Mon Sep 26 14:26:41 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MblSK5XBrz4XBtr; Mon, 26 Sep 2022 14:26:41 +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 4MblSK53B0z3ydv; Mon, 26 Sep 2022 14:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664202401; 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; bh=g4piY+6ewSR+CTFmUh0lOHkC2Wr5Si3UMzLMNyZhyWU=; b=l9GyYyTLCgzG/tTcSUxpLhzKncZt+dsS7Hi5jlEcHUZsrCk04pkfUch4yxlItLWlGpZ4o1 HIkKGgOZLZfh9R+MyS7Sfv2D3bCVgAijWyuXS8zsEbTzCGh1dfFfA/2OXTCAUgTWUTNgOq 5WdHZI2/vXZXu4d/eLn2G+PNe6GkLcGjbbLGC8GZYNOzONzD8cm634z2Y3VssLG/5bGpID YIoMzSq3t70tfNTCbZpvTJnPGIpHmXTq9omjXtWSoaBzV6aa2ixuefln3doK+lYp2xq2N0 7Y8OpEgiDyf1JS1SuXBSNSGCpHc+tIDefLszNU6POjbwH9NPDpX4BbV4PgjVfQ== 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 4MblSK3y3yznmT; Mon, 26 Sep 2022 14:26:41 +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 28QEQf4t060480; Mon, 26 Sep 2022 14:26:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28QEQfg0060479; Mon, 26 Sep 2022 14:26:41 GMT (envelope-from git) Date: Mon, 26 Sep 2022 14:26:41 GMT Message-Id: <202209261426.28QEQfg0060479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2e8403e02158 - stable/13 - dma: use canonical getline() loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2e8403e0215868a13e2bdd1c979fc351971b8d91 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664202401; 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; bh=g4piY+6ewSR+CTFmUh0lOHkC2Wr5Si3UMzLMNyZhyWU=; b=deuUx41pIUtmCsfvwn+mOV17YbdmKUS4TZXf+N/1iqasyE8cnrybFTuc7nNGWcxxP8NgtJ 25QJAhfx+vEMKG6mFURBKwBb6C4+xkQoQCkA3MDMv+jS0nv4N34H5DVKuTec7o//j+jLpX ZZ8npiIntNF9KaSojkEOxFNazJABt26qnkXwnYH3g2QHtFUXcN1o8thto5d5h0KQ+F2+Af tsjuRq/O/KZ/eBExgQNCm+Qx4kFB6SrshgbkdhcLkfgUDVAGWtFy22DncrF00Gt+XiXQxk zwsyFM0ack6TxXkw5CFdfdrMyVZGHfL2Ch49YgEpxIKiYkJyqY7AmGpBVV5v5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664202401; a=rsa-sha256; cv=none; b=wgx5R6faE1cS3bgjGjLWv2tdErNkcN8WoaAWd0K6ywlYccI97FNjvF2gqX2+jLrhfoTtZe Jub7Vn5+ggxwwre0J44weaMO2KwL/lk/q155uy3+iu5Ih2GVtlgMeegoNBTVx2kKtMwJYw +PjTATKN6VQJHieUtNLQ4lMKbUFwYz84sd0YqAO8b5Kt7XJeg49KncXs8X1D2v85wm/H63 3OD3cTYCvZKa6VpuvDa+FLPTYT8j8dRSHjRX4bEWpqOhifsnIwUlBZ622ulLDd6lP1IsmV mEn+IsnJMwEewoe6u5rpxvJQ9PFB1hstewtlNkC2MoU8IWN+KDjLvBEypfDf+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e8403e0215868a13e2bdd1c979fc351971b8d91 commit 2e8403e0215868a13e2bdd1c979fc351971b8d91 Author: Ed Maste AuthorDate: 2022-02-03 18:51:06 +0000 Commit: Ed Maste CommitDate: 2022-09-26 14:26:23 +0000 dma: use canonical getline() loop getline() returns -1 on erorr or EOF, so use that condition instead of feof() and check that there was no error after the loop exits. Reviewed by: bapt, kevans (both earlier) MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34159 (cherry picked from commit d21e71efce3963b068ccaa807a099b591dc220e9) --- contrib/dma/mail.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/contrib/dma/mail.c b/contrib/dma/mail.c index 9e00c22d71db..9641818b8814 100644 --- a/contrib/dma/mail.c +++ b/contrib/dma/mail.c @@ -405,10 +405,8 @@ readmail(struct queue *queue, int nodot, int recp_from_header) if ((ssize_t)error < 0) return (-1); - while (!feof(stdin)) { + while ((linelen = getline(&line, &linecap, stdin)) > 0) { newline[0] = '\0'; - if ((linelen = getline(&line, &linecap, stdin)) <= 0) - break; if (had_last_line) errlogx(EX_DATAERR, "bad mail input format:" " from %s (uid %d) (envelope-from %s)", @@ -510,8 +508,8 @@ readmail(struct queue *queue, int nodot, int recp_from_header) } } } - - ret = 0; + if (ferror(stdin) == 0) + ret = 0; fail: free(line); return (ret);