From: Collin Funk <collin.funk1@gmail.com>
Date: Thu, 27 Nov 2025 20:14:53 +0000 (-0800)
Subject: maint: prefer mcel_eq to mcel_cmp
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8083efff09d9ce74b9d94c907e443e44bbc51991;p=thirdparty%2Fcoreutils.git

maint: prefer mcel_eq to mcel_cmp

* gnulib: Update submodule to latest.
* bootstrap: Run ./bootstrap --bootstrap-sync
* src/expr.c (mbs_logical_cspn): Use mcel_eq instead of mcel_cmp.
* src/join.c (eq_tab, main): Likewise.
---

diff --git a/bootstrap b/bootstrap
index a15c4f5749..441db64522 100755
--- a/bootstrap
+++ b/bootstrap
@@ -37,7 +37,7 @@ medir=`dirname "$me"`
 
 # A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
 
-scriptlibversion=2025-09-07.23; # UTC
+scriptlibversion=2025-11-12.14; # UTC
 
 # Copyright (C) 2003-2025 Free Software Foundation, Inc.
 #
@@ -861,7 +861,7 @@ autopull()
     elif check_exists git-merge-changelog; then
       echo "$0: initializing git-merge-changelog driver"
       git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
-      git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+      git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B "%Y"'
     else
       echo "$0: consider installing git-merge-changelog from gnulib"
     fi
diff --git a/gnulib b/gnulib
index 814a1087ca..27b1797939 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 814a1087ca7b8269949802faf73cc41daed34248
+Subproject commit 27b17979399e67a472af40ac62b46a91850ba268
diff --git a/src/expr.c b/src/expr.c
index 980f8e5188..122f41fc66 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -136,7 +136,7 @@ mbs_logical_cspn (char const *s, char const *accept)
             for (char const *a = accept; *a; )
               {
                 mcel_t h = mcel_scanz (a);
-                if (mcel_cmp (g, h) == 0)
+                if (mcel_eq (g, h))
                   return idx;
                 a += h.len;
               }
diff --git a/src/join.c b/src/join.c
index 3c1763adf4..13c34dce20 100644
--- a/src/join.c
+++ b/src/join.c
@@ -274,7 +274,7 @@ extract_field (struct line *line, char *field, idx_t len)
 static bool
 eq_tab (mcel_t g)
 {
-  return mcel_cmp (g, tab) == 0;
+  return mcel_eq (g, tab);
 }
 
 static bool
@@ -1116,7 +1116,7 @@ main (int argc, char **argv)
                          quote (optarg));
                 output_separator = optarg;
               }
-            if (tab.len && mcel_cmp (tab, newtab) != 0)
+            if (tab.len && ! mcel_eq (tab, newtab))
               error (EXIT_FAILURE, 0, _("incompatible tabs"));
             tab = newtab;
             output_seplen = newtab.len;