mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-02-15 20:02:10 +02:00
982c79fa14
This includes a change to propagate the 4th "mount root" field from /proc/self/mountinfo from the mountlist module, which is needed in a subsequent commit in df. * gl/lib/regcomp.c.diff: Regenerate against latest gnulib. * gl/lib/regex_internal.c.diff: Likewise. * gl/lib/regex_internal.h.diff: Likewise. * cfg.mk: Exclude diffs from trailing whitespace check, which is generally correct, and now needed.
26 lines
739 B
Diff
26 lines
739 B
Diff
diff --git a/lib/regex_internal.c b/lib/regex_internal.c
|
|
index 93d7ee9..9b86a07 100644
|
|
--- a/lib/regex_internal.c
|
|
+++ b/lib/regex_internal.c
|
|
@@ -17,6 +17,8 @@
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
+#include "verify.h"
|
|
+#include "intprops.h"
|
|
static void re_string_construct_common (const char *str, Idx len,
|
|
re_string_t *pstr,
|
|
RE_TRANSLATE_TYPE trans, bool icase,
|
|
@@ -1389,7 +1391,10 @@ static void
|
|
internal_function
|
|
re_node_set_remove_at (re_node_set *set, Idx idx)
|
|
{
|
|
- if (idx < 0 || idx >= set->nelem)
|
|
+ verify (! TYPE_SIGNED (Idx));
|
|
+ /* if (idx < 0)
|
|
+ return; */
|
|
+ if (idx >= set->nelem)
|
|
return;
|
|
--set->nelem;
|
|
for (; idx < set->nelem; idx++)
|