vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update gnulib/argp-help.c to fix garbage in grub-mknetdir --help output

Browse source 
argp_help attempts to translate empty string, which results in printing
meta information about translation, like in

bor@opensuse:~/build/grub> grub2-mknetdir --help
Использование: grub2-mknetdir [ПАРАМЕТР…]
Project-Id-Version: grub 2.02-pre2
Report-Msgid-Bugs-To: bug-grub@gnu.org
...

Update gnulib/argp-help.c to the current version which fixes this
(commit b9bfe78424b871f5b92e5ee9e7d21ef951a6801d).
This commit is contained in:
Andrei Borzenkov 2015-03-05 20:19:47 +03:00
parent 20f21d8978
commit 8842991a56
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
grub-core/gnulib/argp-help.c
View file

@ -1,5 +1,5 @@
/* Hierarchical argument parsing help output /* Hierarchical argument parsing help output
Copyright (C) 1995-2005, 2007, 2009-2013 Free Software Foundation, Inc. Copyright (C) 1995-2005, 2007, 2009-2015 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>. Written by Miles Bader <miles@gnu.ai.mit.edu>.
@ -650,7 +650,7 @@ hol_find_entry (struct hol *hol, const char *name)
return 0; return 0;
} }
/* If an entry with the long option NAME occurs in HOL, set it's special /* If an entry with the long option NAME occurs in HOL, set its special
sort position to GROUP. */ sort position to GROUP. */
static void static void
hol_set_group (struct hol *hol, const char *name, int group) hol_set_group (struct hol *hol, const char *name, int group)
@ -1507,11 +1507,15 @@ argp_doc (const struct argp *argp, const struct argp_state *state,
if (vt) if (vt)
{ {
if (post) if (post)
{
inp_text = vt + 1; inp_text = vt + 1;
if (! *inp_text)
inp_text = 0;
}
else else
{ {
inp_text_len = vt - argp->doc; inp_text_len = vt - argp->doc;
inp_text = __strndup (argp->doc, inp_text_len); inp_text = inp_text_len ? __strndup (argp->doc, inp_text_len) : 0;
} }
} }
else else