Browse files

Workaround from Patrick Oppenlander for a bug in config2help.h that r…


in segfaults on newer toolchains. (That entire section is due for a rewrite.)
  • Loading branch information...
landley committed Oct 3, 2017
1 parent b89af5e commit 78289203031afc23585035c362beec10db54958d
Showing with 6 additions and 4 deletions.
  1. +6 −4 scripts/config2help.c
@@ -262,24 +262,26 @@ int main(int argc, char *argv[])
// entry until we run out of matching pairs.
for (;;) {
struct symbol *throw = 0, *catch;
char *this, *that, *cusage, *tusage, *name;
char *this, *that, *cusage, *tusage, *name = 0;
int len;
// find a usage: name and collate all enabled entries with that name
for (catch = sym; catch; catch = catch->next) {
if (catch->enabled != 1) continue;
if (catch->help && (that = keyword("usage:", catch->help->data))) {
struct double_list *cfrom, *tfrom, *anchor;
char *try, **cdashlines, **tdashlines;
char *try, **cdashlines, **tdashlines, *usage;
int clen, tlen;
// Align usage: lines, finding a matching pair so we can suck help
// text out of throw into catch, copying from this to that
if (!throw) name = that;
if (!throw) usage = that;
else if (strncmp(name, that, len) || !isspace(that[len])) continue;
while (!isspace(*that) && *that) that++;
if (!throw) len = that-name;
if (!throw) len = that-usage;
name = strndup(usage, len);
that = skip_spaces(that);
if (!throw) {
throw = catch;

0 comments on commit 7828920

Please sign in to comment.