Bruno Haible <[email protected]> writes:
> Thanks for the fixes. Can you please tweak them?
>
> - You can include the c-strcase.h unconditionally, because the
> condition in the module description does not test GNULIB_defined_locale_t.
> This is simpler.
>
> - The header file c-strcase.h is not among the list of headers that are
> provided by libc. Therefore better write
> #include "c-strcase.h"
> rather than
> #include <c-strcase.h>
Ah, right. I saw the conditional dependency and thought you could get a
Gnulib import/testdir without the c-strcase.h file. But this is
obviously not the case since the conditional dependency only controls
whether some ./configure tests are run and some files may be added to
lib_SOURCES.
> - It's a far stretch to call it a regression ("regr. 2025-02-16"), since
> the mistake was made when the lib/strcasecmp_l.c was first added.
Yep, I was typing habitually and clearly did not think about the
definition of "regression". :)
Fixed with the attached patches.
Collin
>From bbb058b782d1ba5850924084ac4957e198ccf57d Mon Sep 17 00:00:00 2001
Message-ID: <bbb058b782d1ba5850924084ac4957e198ccf57d.1751690636.git.collin.fu...@gmail.com>
From: Collin Funk <[email protected]>
Date: Fri, 4 Jul 2025 21:19:39 -0700
Subject: [PATCH 1/3] Fix recent ChangeLog entries.
---
ChangeLog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2d52118881..e18a5dcd1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
2025-07-04 Collin Funk <[email protected]>
- strncasecmp_l: Fix missing declaration of c_strncasecmp (regr. 2025-02-16).
+ strncasecmp_l: Fix missing declaration of c_strncasecmp.
* lib/strncasecmp_l.c [GNULIB_defined_locale_t]: Include c-strcase.h.
- strcasecmp_l: Fix missing declaration of c_strcasecmp (regr. 2025-02-16).
+ strcasecmp_l: Fix missing declaration of c_strcasecmp.
* lib/strcasecmp_l.c [GNULIB_defined_locale_t]: Include c-strcase.h.
forkpty: Adjust misleading comment.
--
2.50.0
>From 05c37305b0cf5a997761bb86b14d6e008695fcf6 Mon Sep 17 00:00:00 2001
Message-ID: <05c37305b0cf5a997761bb86b14d6e008695fcf6.1751690636.git.collin.fu...@gmail.com>
In-Reply-To: <bbb058b782d1ba5850924084ac4957e198ccf57d.1751690636.git.collin.fu...@gmail.com>
References: <bbb058b782d1ba5850924084ac4957e198ccf57d.1751690636.git.collin.fu...@gmail.com>
From: Collin Funk <[email protected]>
Date: Fri, 4 Jul 2025 21:23:19 -0700
Subject: [PATCH 2/3] strcasecmp_l: Fix previous change.
Suggested by Bruno Haible in:
<https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00009.html>.
* lib/strcasecmp_l.c: Include c-strcase.h unconditionally. Use
#include "c-strcase.h" instead of #include <c-strcase.h>.
---
ChangeLog | 6 ++++++
lib/strcasecmp_l.c | 4 +---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e18a5dcd1e..b0c19f5622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2025-07-04 Collin Funk <[email protected]>
+ strcasecmp_l: Fix previous change.
+ Suggested by Bruno Haible in:
+ <https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00009.html>.
+ * lib/strcasecmp_l.c: Include c-strcase.h unconditionally. Use
+ #include "c-strcase.h" instead of #include <c-strcase.h>.
+
strncasecmp_l: Fix missing declaration of c_strncasecmp.
* lib/strncasecmp_l.c [GNULIB_defined_locale_t]: Include c-strcase.h.
diff --git a/lib/strcasecmp_l.c b/lib/strcasecmp_l.c
index 2901d12064..151182244b 100644
--- a/lib/strcasecmp_l.c
+++ b/lib/strcasecmp_l.c
@@ -23,9 +23,7 @@
#include <limits.h>
#include <string.h>
-#if GNULIB_defined_locale_t
-# include <c-strcase.h>
-#endif
+#include "c-strcase.h"
int
strcasecmp_l (const char *s1, const char *s2, locale_t locale)
--
2.50.0
>From 7aec9c720bae15f8af0a276be7aff6c1865fd30a Mon Sep 17 00:00:00 2001
Message-ID: <7aec9c720bae15f8af0a276be7aff6c1865fd30a.1751690636.git.collin.fu...@gmail.com>
In-Reply-To: <bbb058b782d1ba5850924084ac4957e198ccf57d.1751690636.git.collin.fu...@gmail.com>
References: <bbb058b782d1ba5850924084ac4957e198ccf57d.1751690636.git.collin.fu...@gmail.com>
From: Collin Funk <[email protected]>
Date: Fri, 4 Jul 2025 21:29:25 -0700
Subject: [PATCH 3/3] strncasecmp_l: Fix previous change.
Suggested by Bruno Haible in:
<https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00009.html>.
* lib/strncasecmp_l.c: Include c-strcase.h unconditionally. Use
#include "c-strcase.h" instead of #include <c-strcase.h>.
---
ChangeLog | 6 ++++++
lib/strncasecmp_l.c | 4 +---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b0c19f5622..692fa95acd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2025-07-04 Collin Funk <[email protected]>
+ strncasecmp_l: Fix previous change.
+ Suggested by Bruno Haible in:
+ <https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00009.html>.
+ * lib/strncasecmp_l.c: Include c-strcase.h unconditionally. Use
+ #include "c-strcase.h" instead of #include <c-strcase.h>.
+
strcasecmp_l: Fix previous change.
Suggested by Bruno Haible in:
<https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00009.html>.
diff --git a/lib/strncasecmp_l.c b/lib/strncasecmp_l.c
index 9e2594a5c9..9981b90fd7 100644
--- a/lib/strncasecmp_l.c
+++ b/lib/strncasecmp_l.c
@@ -23,9 +23,7 @@
#include <limits.h>
#include <string.h>
-#if GNULIB_defined_locale_t
-# include <c-strcase.h>
-#endif
+#include "c-strcase.h"
int
strncasecmp_l (const char *s1, const char *s2, size_t n, locale_t locale)
--
2.50.0
