From nobody Wed Oct 12 15:37:53 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 4MncH5536bz4fbg2; Wed, 12 Oct 2022 15:37:53 +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 4MncH54QDRz3Fjk; Wed, 12 Oct 2022 15:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665589073; 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=yb2clqnpHISbK4wyYh7ZqVGoIjd4PwSl5OlTRdaN13s=; b=EgVnIEUTlZozNma6A7847bjI3gm6J5xkMeZJNMOTEMe+jCUkTLgY3Fw6O60sFWJzHRSTNL KY/ZzE71YlT49DkHRhUKfh10D/VecjG0zw1Uqha1hxQsZ1learh4XI2RPbmyHV2tXDtTz4 UjFZpEKUbw70w8riX0+8eR96RLkdhtRSr1+k94dtobzN6ILXNZlPyJ1GggEUp3gaG74gw9 H+8qlcj/kwheAu9nrdNzDuJFZxo+jRV6rArrTrO9hucU5iv03wisTX1qVGS7gI0hTDKpRs NSO0tavlOfn0HFVdMvv10OdU9Qo76/BNV+OD7iNTTk+6c3L0L6p7leTymeB5KQ== 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 4MncH53CK7z1LtQ; Wed, 12 Oct 2022 15:37:53 +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 29CFbrfX019060; Wed, 12 Oct 2022 15:37:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CFbrjn019059; Wed, 12 Oct 2022 15:37:53 GMT (envelope-from git) Date: Wed, 12 Oct 2022 15:37:53 GMT Message-Id: <202210121537.29CFbrjn019059@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: b58094c0d98e - main - sort: replace home made line reader by getdelim(3) 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: b58094c0d98e5d0ab8abdcdb655ac902ae8ad66e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665589073; 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=yb2clqnpHISbK4wyYh7ZqVGoIjd4PwSl5OlTRdaN13s=; b=pptSY6rHWScGs7YBtPH3CbwL7kkGFqG9KpdyHixpy//o48L3Dk7aAciTdbQrNkt6P855Qo FNsxoa5qA0ui6IebacSJZl+bycu+XkMm15TJNuIOkRXu6MD8sQRNJdWV6Scz1sIvbexmJx zeIHUyCz4DUidB0whMzLdJedRkI9yxbmQmc50klT77yAFuCZp160qyXmCkl/nwXiQ/0j1I t7rrprLkZNN1xG9rD+BDQVFD42ztlfbcsEor1WZsI1HvY9kmxvtgNXQ6z1ssesO7ZAmojR WoUyU0D65lFIrf8mtf0yiTAsqrVMKEBIdB7zIB8X3Dyus6d4CE7JnJEYWaYPYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665589073; a=rsa-sha256; cv=none; b=vFUC2+BtyS66Blu8y8D3XFgeP8Xa2n3aJ99qzQKeCrnuH9KmtHvUOQPiku2TSaKpO0ia5a rhVTkl3/OUgTYwL3chc9AQuahuOKQETB+PUx+rJURt223F2P6wFps0eGt7cIUnrE64QXrn ReMq/yuyNgW4h8a5VhA+MRrmfvGReyatO9UWwFPIFLyjTz0246/D0wNNxkJldt6lSyYE36 5U3Qw/9akHtzBZTiJJwDTdRaPvmNNEsMp2ZfuOQF8XSDH3iUgPXqHQ2skG9gYpHlycdE9Y QGQ1ijCMfmcI0j9qTIkuF0dPasPCsJ798YnB9RiEhRVXGJjmAMu/NdKyAjXyEA== 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=b58094c0d98e5d0ab8abdcdb655ac902ae8ad66e commit b58094c0d98e5d0ab8abdcdb655ac902ae8ad66e Author: Baptiste Daroussin AuthorDate: 2022-10-12 13:31:50 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-12 15:37:33 +0000 sort: replace home made line reader by getdelim(3) The previous code had bug when reading lines with an unexpected encoding, returning without the full line being captured. This result in sort complaining with "sort: Illegal byte sequence" Using getdelim(3) instead of the home made code, fixes the situation. PR: 241679 Reported by: Ronald F. Guilmette MFC After: 1 week Reviewed by: markj, imp Differential Revision: https://reviews.freebsd.org/D36948 --- usr.bin/sort/bwstring.c | 109 ------------------------------------------------ usr.bin/sort/file.c | 18 +++++--- 2 files changed, 12 insertions(+), 115 deletions(-) diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c index 2f2737e94314..52173002986f 100644 --- a/usr.bin/sort/bwstring.c +++ b/usr.bin/sort/bwstring.c @@ -470,115 +470,6 @@ bwsfwrite(struct bwstring *bws, FILE *f, bool zero_ended) } } -/* - * Allocate and read a binary string from file. - * The strings are nl-ended or zero-ended, depending on the sort setting. - */ -struct bwstring * -bwsfgetln(FILE *f, size_t *len, bool zero_ended, struct reader_buffer *rb) -{ - wint_t eols; - - eols = zero_ended ? btowc('\0') : btowc('\n'); - - if (!zero_ended && (mb_cur_max > 1)) { - wchar_t *ret; - - ret = fgetwln(f, len); - - if (ret == NULL) { - if (!feof(f)) - err(2, NULL); - return (NULL); - } - if (*len > 0) { - if (ret[*len - 1] == (wchar_t)eols) - --(*len); - } - return (bwssbdup(ret, *len)); - - } else if (!zero_ended && (mb_cur_max == 1)) { - char *ret; - - ret = fgetln(f, len); - - if (ret == NULL) { - if (!feof(f)) - err(2, NULL); - return (NULL); - } - if (*len > 0) { - if (ret[*len - 1] == '\n') - --(*len); - } - return (bwscsbdup((unsigned char *)ret, *len)); - - } else { - *len = 0; - - if (feof(f)) - return (NULL); - - if (2 >= rb->fgetwln_z_buffer_size) { - rb->fgetwln_z_buffer_size += 256; - rb->fgetwln_z_buffer = sort_realloc(rb->fgetwln_z_buffer, - sizeof(wchar_t) * rb->fgetwln_z_buffer_size); - } - rb->fgetwln_z_buffer[*len] = 0; - - if (mb_cur_max == 1) - while (!feof(f)) { - int c; - - c = fgetc(f); - - if (c == EOF) { - if (*len == 0) - return (NULL); - goto line_read_done; - } - if (c == eols) - goto line_read_done; - - if (*len + 1 >= rb->fgetwln_z_buffer_size) { - rb->fgetwln_z_buffer_size += 256; - rb->fgetwln_z_buffer = sort_realloc(rb->fgetwln_z_buffer, - SIZEOF_WCHAR_STRING(rb->fgetwln_z_buffer_size)); - } - - rb->fgetwln_z_buffer[*len] = c; - rb->fgetwln_z_buffer[++(*len)] = 0; - } - else - while (!feof(f)) { - wint_t c; - - c = fgetwc(f); - - if (c == WEOF) { - if (*len == 0) - return (NULL); - goto line_read_done; - } - if (c == eols) - goto line_read_done; - - if (*len + 1 >= rb->fgetwln_z_buffer_size) { - rb->fgetwln_z_buffer_size += 256; - rb->fgetwln_z_buffer = sort_realloc(rb->fgetwln_z_buffer, - SIZEOF_WCHAR_STRING(rb->fgetwln_z_buffer_size)); - } - - rb->fgetwln_z_buffer[*len] = c; - rb->fgetwln_z_buffer[++(*len)] = 0; - } - -line_read_done: - /* we do not count the last 0 */ - return (bwssbdup(rb->fgetwln_z_buffer, *len)); - } -} - int bwsncmp(const struct bwstring *bws1, const struct bwstring *bws2, size_t offset, size_t len) diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index 1fb02642b5c9..ffcd71e9f991 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -75,7 +75,7 @@ struct file_reader struct reader_buffer rb; FILE *file; char *fname; - unsigned char *buffer; + char *buffer; unsigned char *mmapaddr; unsigned char *mmapptr; size_t bsz; @@ -713,7 +713,7 @@ file_reader_readline(struct file_reader *fr) } } else if (fr->file != stdin) { - unsigned char *strend; + char *strend; size_t bsz1, remsz, search_start; search_start = 0; @@ -785,10 +785,16 @@ file_reader_readline(struct file_reader *fr) fr->strbeg = (strend - fr->buffer) + 1; } else { - size_t len = 0; - - ret = bwsfgetln(fr->file, &len, sort_opts_vals.zflag, - &(fr->rb)); + int delim = sort_opts_vals.zflag ? '\0' : '\n'; + ssize_t len = getdelim(&fr->buffer, &fr->bsz, delim, fr->file); + if (len < 0) { + if (!feof(fr->file)) + err(2, NULL); + return (NULL); + } + if (len > 0 && fr->buffer[len - 1] == delim) + len--; + ret = bwscsbdup(fr->buffer, len); } return (ret);