X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdoc_extract.c;h=b819038888c9df5aee2f879c11eac5b2e7f669a8;hp=d7617a076a752e23c858d1ab75b74a504960c9c7;hb=624871f35e94510b9924ba733f2b878ecf2cc6cc;hpb=7f63d84eb712c54c57c3d4e9a92ffefe2f1b2ade diff --git a/tools/doc_extract.c b/tools/doc_extract.c index d7617a07..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="); @@ -27,16 +44,15 @@ int main(int argc, char *argv[]) type = argv[1]; for (i = 2; i < argc; i++) { char *file, **lines; - unsigned int num; struct list_head *list; struct doc_section *d; file = grab_file(NULL, argv[i], NULL); if (!file) err(1, "Reading file %s", argv[i]); - lines = strsplit(file, file, "\n", &num); + lines = strsplit(file, file, "\n"); - list = extract_doc_sections(lines, num); + list = extract_doc_sections(lines); if (list_empty(list)) errx(1, "No documentation in file %s", argv[i]); talloc_free(file); @@ -61,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++)