mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-20 22:48:22 +00:00
gnulib: Update gnulib version and drop most gnulib patches
In addition to the changes carried in our gnulib patches, several Coverity and code hygiene fixes that were previously downstream are also included in this 3-year gnulib increment. Unfortunately, fix-width.patch is retained. Bump minimum autoconf version from 2.63 to 2.64 and automake from 1.11 to 1.14, as required by gnulib. Sync bootstrap script itself with gnulib. Update regexp module for new dynarray dependency. Signed-off-by: Robbie Harwood <rharwood@redhat.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
1 parent
cd37d3d391
commit
2b79024598
13 files changed
+266
-234
No files matched your search
@@ -1,13 +0,0 @@
|
||||
diff --git a/lib/argp-parse.c b/lib/argp-parse.c
|
||||
index 6dec57310..900adad54 100644
|
||||
--- a/lib/argp-parse.c
|
||||
+++ b/lib/argp-parse.c
|
||||
@@ -940,7 +940,7 @@ weak_alias (__argp_parse, argp_parse)
|
||||
void *
|
||||
__argp_input (const struct argp *argp, const struct argp_state *state)
|
||||
{
|
||||
- if (state)
|
||||
+ if (state && state->pstate)
|
||||
{
|
||||
struct group *group;
|
||||
struct parser *parser = state->pstate;
|
||||
@@ -1,12 +0,0 @@
|
||||
--- a/lib/argp-help.c 2020-10-28 14:32:19.189215988 +0000
|
||||
+++ b/lib/argp-help.c 2020-10-28 14:38:21.204673940 +0000
|
||||
@@ -145,7 +145,8 @@
|
||||
if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin)
|
||||
{
|
||||
__argp_failure (state, 0, 0,
|
||||
- dgettext (state->root_argp->argp_domain,
|
||||
+ dgettext (state == NULL ? NULL
|
||||
+ : state->root_argp->argp_domain,
|
||||
"\
|
||||
ARGP_HELP_FMT: %s value is less than or equal to %s"),
|
||||
"rmargin", up->name);
|
||||
@@ -1,15 +0,0 @@
|
||||
--- a/lib/regcomp.c 2020-11-24 17:06:08.159223858 +0000
|
||||
+++ b/lib/regcomp.c 2020-11-24 17:06:15.630253923 +0000
|
||||
@@ -3808,11 +3808,7 @@
|
||||
create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
|
||||
re_token_type_t type)
|
||||
{
|
||||
- re_token_t t;
|
||||
-#if defined GCC_LINT || defined lint
|
||||
- memset (&t, 0, sizeof t);
|
||||
-#endif
|
||||
- t.type = type;
|
||||
+ re_token_t t = { .type = type };
|
||||
return create_token_tree (dfa, left, right, &t);
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000
|
||||
+++ b/lib/regexec.c 2020-11-05 10:55:09.621542984 +0000
|
||||
@@ -1692,6 +1692,9 @@
|
||||
{
|
||||
Idx top = mctx->state_log_top;
|
||||
|
||||
+ if (mctx->state_log == NULL)
|
||||
+ return REG_NOERROR;
|
||||
+
|
||||
if ((next_state_log_idx >= mctx->input.bufs_len
|
||||
&& mctx->input.bufs_len < mctx->input.len)
|
||||
|| (next_state_log_idx >= mctx->input.valid_len
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/lib/regcomp.c 2020-10-22 13:49:06.770168928 +0000
|
||||
+++ b/lib/regcomp.c 2020-10-22 13:50:37.026528298 +0000
|
||||
@@ -3662,7 +3662,7 @@
|
||||
Idx alloc = 0;
|
||||
#endif /* not RE_ENABLE_I18N */
|
||||
reg_errcode_t ret;
|
||||
- re_token_t br_token;
|
||||
+ re_token_t br_token = {0};
|
||||
bin_tree_t *tree;
|
||||
|
||||
sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
|
||||
@@ -1,14 +0,0 @@
|
||||
--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000
|
||||
+++ b/lib/regexec.c 2020-10-21 14:32:07.961765604 +0000
|
||||
@@ -828,7 +828,11 @@
|
||||
break;
|
||||
if (__glibc_unlikely (err != REG_NOMATCH))
|
||||
goto free_return;
|
||||
+#ifdef DEBUG
|
||||
+ /* Only used for assertion below when DEBUG is set, otherwise
|
||||
+ it will be over-written when we loop around. */
|
||||
match_last = -1;
|
||||
+#endif
|
||||
}
|
||||
else
|
||||
break; /* We found a match. */
|
||||
Reference in new issue
Block a user