From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by sourceware.org (Postfix) with ESMTP id 5DF2D3858D28 for ; Sun, 7 May 2023 22:56:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5DF2D3858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=nabijaczleweli.xyz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nabijaczleweli.xyz Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 5F6CC7A48 for ; Mon, 8 May 2023 00:56:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202305; t=1683500167; bh=+xBkdnpMYJRBX6m5bYVA5OJnAJVSkivSpS9UyhzfDJI=; h=Date:From:Cc:Subject:From; b=cLS+p5Kpa4LKZmUlAcE2403VZE0cIVLZvMwKUgoH4SABb70FD0El+qSaZVnDLoBGs 3VIH+BxDKei7jzz7JPHM0A4X/92RDtmUYwMNgtWXB2cBjLeSD3xieST2VQy6/43o0M E8AZJd9R8Q3gk8qHt4p5emiP4ur/78D2dPTuDw3ZnoMVIbsFLprfWhGMhy7gbiB6wh Vd18eCtlWgZHNbMFJZlxpUeaotJpu5TbLV+mNKBssIeit/PwXj6lsFgB+7W4MZt4SG +t/bSdpO0LhCB1DCAfVmhr3RePU1pe3ZaNVRFWInB2RWowU/lugiSE06u/SqUQzNDD SDbcWppmwyDYg== Date: Mon, 8 May 2023 00:56:06 +0200 From: =?utf-8?B?0L3QsNCx?= Cc: libc-alpha@sourceware.org Subject: [PATCH v4 1/3] posix: add (failing) test for REG_STARTEND Message-ID: <1d5642ecb4bb477c9fd7e1ebaee868fe4ccbefc7.1683500149.git.nabijaczleweli@nabijaczleweli.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="unssrofrsjjvkdbk" Content-Disposition: inline User-Agent: NeoMutt/20230407 X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_INFOUSMEBIZ,MISSING_HEADERS,RDNS_DYNAMIC,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --unssrofrsjjvkdbk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This test passes on NetBSD, the illumos gate, and musl with https://www.openwall.com/lists/musl/2023/04/20/2; it's nothing revolutionary and the behaviour it tests is largely guaranteed by the 4.4BSD-Lite manual; nevertheless, it currently fails with tst-reg-startend.c: ^a: a^@c: no match$ tst-reg-startend.c: ^a: a^@c: wanted {1, 2}, got {1, 4}$ tst-reg-startend.c: ^a: abc: no match$ tst-reg-startend.c: ^a: abc: wanted {1, 2}, got {1, 4}$ tst-reg-startend.c: ^a.c$: a^@c: no match$ tst-reg-startend.c: ^a.c$: abc: no match$ tst-reg-startend.c: ^a.*c$: a^@c: no match$ tst-reg-startend.c: ^a.*c$: abc: no match$ tst-reg-startend.c: ^a[^c]c$: a^@c: no match$ tst-reg-startend.c: ^a[^c]c$: abc: no match$ tst-reg-startend.c: ^a..: a^@c: no match$ tst-reg-startend.c: ^a..: abc: no match$ tst-reg-startend.c: ..c: a^@c: no match$ The test may also be compiled stand-alone (-DSTANDALONE) and on all platforms that have the interface (hence the macro to initialise regmatch_ts, which start with pointer fields on the illumos gate), for ease of testing and inclusion in other test suites. Signed-off-by: Ahelenia Ziemia=C5=84ska --- Resending after a week; clean rebase. posix/Makefile | 1 + posix/tst-reg-startend.c | 124 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 posix/tst-reg-startend.c diff --git a/posix/Makefile b/posix/Makefile index cc77e939ad..24aeb781ca 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -295,6 +295,7 @@ tests :=3D \ tst-posix_spawn-setsid \ tst-preadwrite \ tst-preadwrite64 \ + tst-reg-startend \ tst-regcomp-truncated \ tst-regex \ tst-regex2 \ diff --git a/posix/tst-reg-startend.c b/posix/tst-reg-startend.c new file mode 100644 index 0000000000..c3bfac0359 --- /dev/null +++ b/posix/tst-reg-startend.c @@ -0,0 +1,124 @@ +/* Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#include +#include +#include +#include +#include +#include + + +#define M(s, e) (regmatch_t) {.rm_so =3D s, .rm_eo =3D e} +#define MEQ(l, r) ((l).rm_so =3D=3D (r).rm_so && (l).rm_eo =3D=3D (r).rm_e= o) + +static const regmatch_t bound =3D M(1, 4); + +static const char *const regex_ac[] =3D + {"^a", "c$", "^a.c$", "^a.*c$", "^a[^c]c$", "^a..", "..c", "[^z]c", NULL= }; +static const char *const regex_aa[] =3D + {"^", "^a", "a$", "^\\(a\\).\\1$", "^a[^a]*", NULL}; +static const char *const data_ac[] =3D {"_a\0cdef", "_abcdef"}; +static const char *const data_aa[] =3D {"_a\0adef", "_abadef"}; +static const regmatch_t results_ac[] =3D + {M(1, 2), M(3, 4), M(1, 4), M(1, 4), M(1, 4), M(1, 4), M(1, 4), M(2, 4)}; +static const regmatch_t results_aa[] =3D + {M(1, 1), M(1, 2), M(3, 4), M(1, 4), M(1, 3)}; +static_assert(sizeof(regex_ac) / sizeof(*regex_ac) - 1 =3D=3D + sizeof(results_ac) / sizeof(*results_ac), ""); +static_assert(sizeof(regex_aa) / sizeof(*regex_aa) - 1 =3D=3D + sizeof(results_aa) / sizeof(*results_aa), ""); + + +static bool +testbunch (const char *const *regexes, const char *const data[static 2], + const regmatch_t *results) +{ +#define BASEERR(data) \ + err =3D true, \ + fprintf (stdout, __FILE__ ": %s: ", *regexes), \ + fwrite (data[i] + bound.rm_so, 1, bound.rm_eo - bound.rm_so, stdout) + + bool err =3D false; + for (; *regexes; ++regexes, ++results) + { + regex_t rgx; + assert (!regcomp (&rgx, *regexes, 0)); + + for (size_t i =3D 0; i < 2; ++i) + { + regmatch_t match =3D bound; + if (regexec (&rgx, data[i], 1, &match, REG_STARTEND)) + BASEERR(data), fputs (": no match\n", stdout); + + if (!MEQ(match, *results)) + BASEERR(data), fprintf (stdout, ": wanted {%d, %d}, got {%d, %= d}\n", + (int)results->rm_so, (int)results->rm_= eo, + (int)match.rm_so, (int)match.rm_eo); + } + + regfree(&rgx); + } + + return err; +} + + +static const char *const mb_data[2] =3D {"_aa=C4=87def", "_a=C4=87def"}; +static const bool mb_exp[] =3D {false, true}; + +static bool +testmb (void) +{ + bool err =3D false; + regex_t rgx; + const char *const regexes[] =3D {"a=C4=87"}; + assert (!regcomp (&rgx, *regexes, 0)); + + for (size_t i =3D 0; i < 2; ++i) + { + regmatch_t match =3D bound; + if (regexec (&rgx, mb_data[i], 1, &match, REG_STARTEND) =3D=3D mb_ex= p[i]) + BASEERR(mb_data), fprintf (stdout, ": %s match\n", + mb_exp[i] ? "no" : "yes"); + + if (!MEQ(match, bound)) + BASEERR(mb_data), fprintf (stdout, ": wanted {%d, %d}, got {%d, %d= }\n", + (int)bound.rm_so, (int)bound.rm_eo, + (int)match.rm_so, (int)match.rm_eo); + } + + regfree(&rgx); + return err; +} + + +static int +do_test (int argc, char **argv) +{ + (void) argc, (void) argv; + assert (setlocale (LC_ALL, "C.UTF-8")); + + return testbunch (regex_ac, data_ac, results_ac) || + testbunch (regex_aa, data_aa, results_aa) || + testmb (); +} + + +#ifndef STANDALONE +#include "../test-skeleton.c" +#else +int +main(int argc, char **argv) +{ + return do_test(argc, argv); +} +#endif --=20 2.30.2 --unssrofrsjjvkdbk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmRYLIUACgkQvP0LAY0m WPG0xA//Vm5iNqZiiwtyQ+ayGvatxG6kXy3oP7SPyCIgraFwUWQRwa2RHeC+PdRL S7g8BHHrVX1sUz82BpA0Bj2i7zYcuNEUNQG334HBc6fB6LoUPfp2HdjDdOA9YVgE Atwrz6/68RA6ufAQ0vmt+6a0w+i+K64PggkX3e4fjxO0iN7pxYl5BTw+l4AoA9d+ jt+kYRG8SCR3ngLluT0P0JTE4M9AlRnJglkdJupNhXLGzakrSxYEB2JUqKTf6n3N D0qSUbTpp7bkJkPhMPUgscQzyMIb19gkJEmNjZVisPwBEOrOZl6FzhpDaPyD3ivW tQEMdJX/rPu/yWoPlugVBF0PIvrcg4O+qDY3m4aJxQwW+9hqBlWuoqL1VRveuTjK Zwc/SGqy1pivgXQLdJo0HiIhtXQ3xEMmen9jv5Z88rhZmAodvg/kp9hZqb3i2t7a erioFOlUdcLhhXfyhLfpxrPeEGKcwQoCloIIIioNYCsOPuExszzu9nU26j8bFPm8 SE2IQe0Sr4dN1460nfZwBlkBr5GCW4e1lrA1kA7c9r8juf4EIQw1MJmX9M2sIt3R Bv9CFQQpmNtQl5j0lv54ibCwyaAmOPlpR7ihm2eB2MjMQGT4XjA+smDt4P6WcQ/M C7GkW3l1Xnq29AnKhVWrb0LtDZ3yB4DjFtu0IJTDiFajaFugoDU= =wfh/ -----END PGP SIGNATURE----- --unssrofrsjjvkdbk--