X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdoc_extract.c;h=b70325ea47f51a00f7db114024bbbc24e2089920;hp=b4ac0d3e6e144e6daa33d188d895baf12b874063;hb=2e0ef31d8963eb146337093252d6ae28d2b18813;hpb=650c775ff00cccd03fc84e7789a03c51d9839004

diff --git a/tools/doc_extract.c b/tools/doc_extract.c
index b4ac0d3e..b70325ea 100644
--- a/tools/doc_extract.c
+++ b/tools/doc_extract.c
@@ -9,63 +9,8 @@
 #include <fcntl.h>
 #include <stdbool.h>
 #include "talloc/talloc.h"
+#include "string/string.h"
 
-/* Is A == B ? */
-#define streq(a,b) (strcmp((a),(b)) == 0)
-
-/* Does A start with B ? */
-#define strstarts(a,b) (strncmp((a),(b),strlen(b)) == 0)
-
-/* This version adds one byte (for nul term) */
-static void *grab_file(void *ctx, const char *filename)
-{
-	unsigned int max = 16384, size = 0;
-	int ret, fd;
-	char *buffer;
-
-	if (streq(filename, "-"))
-		fd = dup(STDIN_FILENO);
-	else
-		fd = open(filename, O_RDONLY, 0);
-
-	if (fd < 0)
-		return NULL;
-
-	buffer = talloc_array(ctx, char, max+1);
-	while ((ret = read(fd, buffer + size, max - size)) > 0) {
-		size += ret;
-		if (size == max)
-			buffer = talloc_realloc(ctx, buffer, char, max*=2 + 1);
-	}
-	if (ret < 0) {
-		talloc_free(buffer);
-		buffer = NULL;
-	} else
-		buffer[size] = '\0';
-	close(fd);
-	return buffer;
-}
-
-/* This is a dumb one which copies.  We could mangle instead. */
-static char **split(const char *text)
-{
-	char **lines = NULL;
-	unsigned int max = 64, num = 0;
-
-	lines = talloc_array(text, char *, max+1);
-
-	while (*text != '\0') {
-		unsigned int len = strcspn(text, "\n");
-		lines[num] = talloc_array(lines, char, len + 1);
-		memcpy(lines[num], text, len);
-		lines[num][len] = '\0';
-		text += len + 1;
-		if (++num == max)
-			lines = talloc_realloc(text, lines, char *, max*=2 + 1);
-	}
-	lines[num] = NULL;
-	return lines;
-}
 
 int main(int argc, char *argv[])
 {
@@ -79,7 +24,7 @@ int main(int argc, char *argv[])
 		file = grab_file(NULL, argv[i]);
 		if (!file)
 			err(1, "Reading file %s", argv[i]);
-		lines = split(file);
+		lines = strsplit(file, file, "\n", NULL);
 
 		for (j = 0; lines[j]; j++) {
 			if (streq(lines[j], "/**")) {