From nobody Thu Oct 13 08:24:24 2022 X-Original-To: dev-commits-src-main@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 4Mp2cS3kL0z4fQBD; Thu, 13 Oct 2022 08:24:24 +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 4Mp2cS37Mgz3qWy; Thu, 13 Oct 2022 08:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665649464; 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=QUAw8549gRGdD6QJFq11oqDwjEWn494uhrieEF9WSCE=; b=NeoRH9AbescL57GP1t7Q506XFCJln21OGLwAmZJ3e3xBxhrc35ehe//EB7uH79ReRmm6rC 6AZmkdh308APxzdU8pkjdoTGypO7isaA01dFaWwFAebsIjwzyFux2VX4xmUE0xQxx595Mu sSNyw1hFqIFdQkw83XGPnf/8dxkUGGBwO/w1EXgbeIE3jVre5QlNzWVm3KY5rskJ2kGqlY xC4ScY9mpNNxOGj0/7mvnAucK1nLETEOTGa0jeatZqM64EuADqVN60dc3PosIyJX3Vhywz S8mOwqU4rfJz8zs4vyCjyEgdaMQcjGgqukMqh52P5M/MZDoQ49QUG+b63izooA== 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 4Mp2cS2CXtzMP4; Thu, 13 Oct 2022 08:24:24 +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 29D8OO4P075690; Thu, 13 Oct 2022 08:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29D8OOc1075689; Thu, 13 Oct 2022 08:24:24 GMT (envelope-from git) Date: Thu, 13 Oct 2022 08:24:24 GMT Message-Id: <202210130824.29D8OOc1075689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: f079ef8aa428 - main - sort: simplify the code to handle -z flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f079ef8aa428ebffad28f5c62cce52c2bf70fb49 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665649464; 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=QUAw8549gRGdD6QJFq11oqDwjEWn494uhrieEF9WSCE=; b=gnGvILtNFKlYOJAY2X1JI6gsjLoPoX0BGe29MHY6vCmpBB1we6fqAwlssloqyxMab7T2Ow F6i5HeLw7CejWokU/aEcYxp/2TYdR+AWT42oRv5tqn6VUOY5m14QwDgC6h/uC06KHZ9Py+ bfZYgqtINuRNNF0MEWz2QUo/H5BPWyqWGmY6PmE1CwuQuRWYVCk105fkD7rAwJac+svqJH ij8DenRpQsijlss7d1nq2ebsHtODisFLMAj1Au5muhyKKlNougWBC+8elfDxC78guy7okk DAyml0aZPycBuul8BIQp0/K5hL4wfJrP1B4lwEh5NiIUuKHb9yq1/duNvVoJDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665649464; a=rsa-sha256; cv=none; b=vSEkppNNwAa17IsZ7C9MAw/iVaYg19PBlRAmz4qhYReJhrKRHUA8OJE5+vuyMhaJLDcfZZ 2zQyRB2eUe9M/h5yelFefR6/ZWjdbQ8OWbgBpRFU7auV9WQVAxylioquwAOn16/hJzXYop 9FHRUh6v6L13wPNI8OJsTzvwpWFjYRN/fmxDr+0VJl/+C/938wnZ/LFrHEJhfsmqWNVI49 d94JNLBPco+ExcBOXq61jwsbvUIbtDuhsUjkvXp81t5nRsBEU7VyV+aTIc7fNOlRqPM4MU OP33Z+RZKFFwkuG/kU6bXP0aWfjfzQbkaj6LL0t5IDR1vWtA7ST8oW/E6PZ71g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f079ef8aa428ebffad28f5c62cce52c2bf70fb49 commit f079ef8aa428ebffad28f5c62cce52c2bf70fb49 Author: Baptiste Daroussin AuthorDate: 2022-10-13 08:21:48 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-13 08:24:11 +0000 sort: simplify the code to handle -z flag --- 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 bfe5e5c29b86..2e3b4e0a4350 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -605,10 +605,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) { @@ -687,14 +684,15 @@ file_reader_readline(struct file_reader *fr) } } } 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); }