X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdoc_extract.c;h=99c3202ca0bf2ccd1034b113a02cc71a6a27fe32;hp=c8ecbf8e6965240c02630884bc64b9af44ccfdf6;hb=adc90816df194167a588a943ae503a37fec3fb6a;hpb=44c480c492c4596801261d748c5e3339c30f1f7e

diff --git a/tools/doc_extract.c b/tools/doc_extract.c
index c8ecbf8e..99c3202c 100644
--- a/tools/doc_extract.c
+++ b/tools/doc_extract.c
@@ -1,13 +1,29 @@
 /* This merely extracts, doesn't do XML or anything. */
-#include <err.h>
+#include <ccan/str/str.h>
+#include <ccan/err/err.h>
+#include <ccan/tal/grab_file/grab_file.h>
+#include "tools.h"
 #include <string.h>
 #include <stdio.h>
-#include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
-#include <ccan/talloc/talloc.h>
-#include <ccan/grab_file/grab_file.h>
 #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 +32,7 @@ int main(int argc, char *argv[])
 
 	if (argc < 3)
 		errx(1, "Usage: doc_extract [--function=<funcname>] TYPE <file>...\n"
-		     "Where TYPE is functions|author|licence|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,19 +43,18 @@ 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);
+		file = grab_file(NULL, argv[i]);
 		if (!file)
 			err(1, "Reading file %s", argv[i]);
-		lines = strsplit(file, file, "\n", &num);
+		lines = tal_strsplit(file, file, "\n", STR_EMPTY_OK);
 
-		list = extract_doc_sections(lines, num);
+		list = extract_doc_sections(lines, argv[i]);
 		if (list_empty(list))
 			errx(1, "No documentation in file %s", argv[i]);
-		talloc_free(file);
+		tal_free(file);
 
 		if (streq(type, "functions")) {
 			const char *last = NULL;
@@ -61,14 +76,14 @@ 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++)
 					printf("%s\n", d->lines[j]);
 			}
 		}
-		talloc_free(list);
+		tal_free(list);
 	}
 	return 0;
 }