35b909062e
Upgrade Gnulib files to 20190105. It's much easier to maintain GRUB's use of portability support files from Gnulib when the process is automatic and driven by a single configuration file, rather than by maintainers occasionally running gnulib-tool and committing the result. Removing these automatically-copied files from revision control also removes the temptation to hack the output in ways that are difficult for future maintainers to follow. Gnulib includes a "bootstrap" program which is designed for this. The canonical way to bootstrap GRUB from revision control is now "./bootstrap", but "./autogen.sh" is still useful if you just want to generate the GRUB-specific parts of the build system. GRUB now requires Autoconf >= 2.63 and Automake >= 1.11, in line with Gnulib. Gnulib source code is now placed in grub-core/lib/gnulib/ (which should not be edited directly), and GRUB's patches are in grub-core/lib/gnulib-patches/. I've added a few notes to the developer manual on how to maintain this. Signed-off-by: Colin Watson <cjwatson@ubuntu.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
26 lines
822 B
Diff
26 lines
822 B
Diff
diff --git a/lib/regcomp.c b/lib/regcomp.c
|
|
index cc85f35ac..de45ebb5c 100644
|
|
--- a/lib/regcomp.c
|
|
+++ b/lib/regcomp.c
|
|
@@ -528,9 +528,9 @@ regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf,
|
|
to this routine. If we are given anything else, or if other regex
|
|
code generates an invalid error code, then the program has a bug.
|
|
Dump core so we can fix it. */
|
|
- abort ();
|
|
-
|
|
- msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
|
|
+ msg = gettext ("unknown regexp error");
|
|
+ else
|
|
+ msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
|
|
|
|
msg_size = strlen (msg) + 1; /* Includes the null. */
|
|
|
|
@@ -1136,7 +1136,7 @@ optimize_utf8 (re_dfa_t *dfa)
|
|
}
|
|
break;
|
|
default:
|
|
- abort ();
|
|
+ break;
|
|
}
|
|
|
|
if (mb_chars || has_period)
|