From nobody Wed Oct 19 08:01:30 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 4MsjqG3c8Rz4gDRf; Wed, 19 Oct 2022 08:01:30 +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 4MsjqG2zL2z3xmK; Wed, 19 Oct 2022 08:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166490; 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=HNDMCuwalwlygZRBWOPhklR2PO9omAQ+Ob7nluoqXHo=; b=JY7HHznQsY1KIsh67SkbK8775cVRWPQSSaYWDqsdhTAWoWvdFkoMPagvBSmuhh72IH5ReB 8wZauWjDeG/RHpwEm1RHAXCTSfpmt7idSVc4/Ngeuvhibx2nI1g/6XE9tBUR80kV00rgUu vy4YXEnxCmWBtgpWPHj9l6g3762gaYKuVS/jMdu4zKKHSLuFsyia/8y/eBKzgJHkNXx7iD g92byU4qSXu0z/JFgZA8pGij8aQqxFn3E6yBT52m86bfebgAq1s9UqGQSljl8y5BljSd+H PkrhnZhvtU/52DxMteU3xDp+P6m8LY5o16JXBLxc1mniot8rCBO7GmTVY9yYQQ== 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 4MsjqG24q9zSTM; Wed, 19 Oct 2022 08:01:30 +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 29J81U0E060719; Wed, 19 Oct 2022 08:01:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J81UHS060718; Wed, 19 Oct 2022 08:01:30 GMT (envelope-from git) Date: Wed, 19 Oct 2022 08:01:30 GMT Message-Id: <202210190801.29J81UHS060718@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: cacedfd1dfef - stable/13 - sort: simplify the code to handle -z flag 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cacedfd1dfef096322e6f9d4473bca8066db994f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166490; 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=HNDMCuwalwlygZRBWOPhklR2PO9omAQ+Ob7nluoqXHo=; b=vckI49DlFl9nAzzhAcWXt0c232pOAXm5Qd8XLsY7WdPTHy3ugurCgVHT3zPBQsSfIbpBF4 y42/omPDzlSYct5tyZT5/e73A10uMvstur24Cz/dn8iJAkfiS6ueuwaJXMC33Soezw0Mod 4MAU29ymGV5cKd7xNiNOma29tCRocA6+Tuf+CKhJbOZV9/D7V0MgWofgy/TqJWsMoy7AQe 7CgESVckO5S4Cc1EGXESG+7AQcaNko8A2DUDtiR0+05+kpNAjaAa8WfSoeJvtNwIBu6qTT vHBWPVDxXX7UrsLY52pRNq3grGJOsb2oUaUn8IHki//wul1c5Ql5SDItIP2Rhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666166490; a=rsa-sha256; cv=none; b=LWr3UyEh6524zFz0uU70up9sd797Mjw66psrmt79bom1PZVTXz8UOQl6mt82fPXKxsep5Y GKwpnp6Mi/VCGzin+11YLXw2osf2eF07m+fWk9ZARIC9s9/XH0Y7UuAukwFE7YaeNn7z/n Puc0Zi16kIb5AWB8TiHfSx7p4pUU/fSTCGkVDFez7/aMzcxrZJh0ywpMFT6MDiVdku5ZgX bSjQcTq98X6eOMh89dH9FpHhtpr39+qHfqUCGVgoldQerTLXr9suUJpnGWhRPrA73InBcD +t9XwciIB5B7gjytNnp52bAygYlp3lcbYhXYqAVj+aMzD+oeX97vgN57fsud0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=cacedfd1dfef096322e6f9d4473bca8066db994f commit cacedfd1dfef096322e6f9d4473bca8066db994f Author: Baptiste Daroussin AuthorDate: 2022-10-13 08:21:48 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-19 07:59:29 +0000 sort: simplify the code to handle -z flag (cherry picked from commit f079ef8aa428ebffad28f5c62cce52c2bf70fb49) --- usr.bin/sort/file.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index 3e5754442ac1..b48948e1edee 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -617,10 +617,7 @@ file_reader_init(const char *fsrc) ret = sort_calloc(1, sizeof(struct file_reader)); - ret->elsymb = '\n'; - if (sort_opts_vals.zflag) - ret->elsymb = 0; - + ret->elsymb = sort_opts_vals.zflag ? '\0' : '\n'; ret->fname = sort_strdup(fsrc); if (strcmp(fsrc, "-") && (compress_program == NULL) && use_mmap) { @@ -785,14 +782,15 @@ file_reader_readline(struct file_reader *fr) fr->strbeg = (strend - fr->buffer) + 1; } else { - int delim = sort_opts_vals.zflag ? '\0' : '\n'; - ssize_t len = getdelim(&fr->buffer, &fr->bsz, delim, fr->file); + ssize_t len; + + len = getdelim(&fr->buffer, &fr->bsz, fr->elsymb, fr->file); if (len < 0) { if (!feof(fr->file)) err(2, NULL); return (NULL); } - if (len > 0 && fr->buffer[len - 1] == delim) + if (len > 0 && fr->buffer[len - 1] == fr->elsymb) len--; ret = bwscsbdup(fr->buffer, len); }