Re: [glibc] regex: copy back from Gnulib

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 2450 bytes --]

On 9/21/21 2:44 PM, Carlos O'Donell wrote:

> In the future please post such changes for review on the list (I don't see it on
> libc-alpha, patchwork, or see any Reviewed-by: tags).

I posted it on libc-alpha a while ago; that's where Joseph picked it up.

https://sourceware.org/pipermail/libc-alpha/2021-August/130571.html


> I would like to review such changes as part of our normal code review.

I'd also like reviews. Unfortunately it's hard to get good regex 
reviews. The code is hairy and nobody really understands it, other than 
maybe its long-gone author.


> Could you please also update SHARED-FILES with a "# Merged from gnulib YYYY-MM-DD"
> marker for updated files?

Sure, done by committing the attached.

It is unfortunate that glibc has a file for this (SHARED-FILES) that I 
didn't know about until now, while Gnulib has its own file in a fancier 
format for the same thing (config/srclist.txt), so that I need to 
remember to update both. Plus, they surely disagree with each other. At 
some point I'll try to find time to iron out the discrepancies.


PS. When I first tried to commit the change I got the following 
offputting diagnostic. Is there any chance we could change the 
commit-message encoding from ISO-8895-15 to UTF-8? Requiring ISO-8895-15 
seems so 2nd-millennium; even downgrading to requiring ASCII would be 
better, as ASCII is UTF-8-compatible.

> 3-penguin $ git push
> Enumerating objects: 5, done.
> Counting objects: 100% (5/5), done.
> Delta compression using up to 4 threads
> Compressing objects: 100% (3/3), done.
> Writing objects: 100% (3/3), 459 bytes | 229.00 KiB/s, done.
> Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
> remote: *** Invalid revision history for commit 3e45d44dd2922890aec56fbd415621cb0b56a95f:
> remote: *** It contains characters not in the ISO-8859-15 charset.
> remote: *** 
> remote: *** Below is the first line where this was detected (line 1):
> remote: *** | Mention today’s regex merge in SHARED-FILES
> remote: ***                ^
> remote: ***                |
> remote: *** 
> remote: *** Please amend the commit's revision history to remove it
> remote: *** and try again.
> remote: error: hook declined to update refs/heads/master
> To sourceware.org:/git/glibc.git
>  ! [remote rejected]       master -> master (hook declined)
> error: failed to push some refs to 'sourceware.org:/git/glibc.git'

[-- Attachment #2: 0001-Mention-today-s-regex-merge-in-SHARED-FILES.patch --]
[-- Type: text/x-patch, Size: 1635 bytes --]

From 3e45d44dd2922890aec56fbd415621cb0b56a95f Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 21 Sep 2021 17:53:13 -0700
Subject: [PATCH] =?UTF-8?q?Mention=20today=E2=80=99s=20regex=20merge=20in?=
 =?UTF-8?q?=20SHARED-FILES?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SHARED-FILES | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/SHARED-FILES b/SHARED-FILES
index 38f189727c..03fa41a4fd 100644
--- a/SHARED-FILES
+++ b/SHARED-FILES
@@ -31,6 +31,10 @@ gnulib:
   crypt/md5.h
   dirent/alphasort.c
   dirent/scandir.c
+  # Merged from gnulib 2021-09-21
+  include/intprops.h
+  # Merged from gnulib 2021-09-21
+  include/regex.h
   locale/programs/3level.h
   # Merged from gnulib 2014-6-23
   malloc/obstack.c
@@ -41,6 +45,8 @@ gnulib:
   misc/error.h
   misc/getpass.c
   misc/mkdtemp.c
+  # Merged from gnulib 2021-09-21
+  misc/sys/cdefs.h
   posix/fnmatch_loop.c
   # Intended to be the same. Gnulib copy contains glibc changes.
   posix/getopt.c
@@ -49,11 +55,17 @@ gnulib:
   # Intended to be the same. Gnulib copy contains glibc changes.
   posix/getopt_int.h
   posix/glob.c
+  # Merged from gnulib 2021-09-21
   posix/regcomp.c
+  # Merged from gnulib 2021-09-21
   posix/regex.c
+  # Merged from gnulib 2021-09-21
   posix/regex.h
+  # Merged from gnulib 2021-09-21
   posix/regex_internal.c
+  # Merged from gnulib 2021-09-21
   posix/regex_internal.h
+  # Merged from gnulib 2021-09-21
   posix/regexec.c
   posix/spawn.c
   posix/spawn_faction_addclose.c
-- 
2.31.1