From: Rusty Russell Date: Wed, 7 Dec 2011 02:55:41 +0000 (+1030) Subject: tools/doc_extract: simplify handling fields with spaces in them. X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=2f780d578cf2c102957f7872f6edbcbffb8cba69;ds=sidebyside tools/doc_extract: simplify handling fields with spaces in them. eg. "See also" can match "see-also". --- diff --git a/tools/doc_extract.c b/tools/doc_extract.c index 5a48b79f..b8190388 100644 --- a/tools/doc_extract.c +++ b/tools/doc_extract.c @@ -8,6 +8,23 @@ #include #include "doc_extract.h" +/* We regard non-alphanumerics as equiv. */ +static bool typematch(const char *a, const char *b) +{ + size_t i; + + for (i = 0; a[i]; i++) { + if (cisalnum(a[i])) { + if (a[i] != b[i]) + return false; + } else { + if (cisalnum(b[i])) + return false; + } + } + return b[i] == '\0'; +} + int main(int argc, char *argv[]) { unsigned int i; @@ -16,7 +33,7 @@ int main(int argc, char *argv[]) if (argc < 3) errx(1, "Usage: doc_extract [--function=] TYPE ...\n" - "Where TYPE is functions|author|license|maintainer|summary|description|example|all"); + "Where TYPE is functions|author|license|maintainer|summary|description|example|see_also|all"); if (strstarts(argv[1], "--function=")) { function = argv[1] + strlen("--function="); @@ -60,7 +77,7 @@ int main(int argc, char *argv[]) } if (streq(type, "all")) printf("%s:\n", d->type); - else if (!streq(d->type, type)) + else if (!typematch(d->type, type)) continue; for (j = 0; j < d->num_lines; j++)