tdb: use tdb_nest_lock() for active lock.

[ccan] / tools / doc_extract.c

diff --git a/tools/doc_extract.c b/tools/doc_extract.c
index aa3f2206cc3bace91b18b657690d2d282084a9a1..c8ecbf8e6965240c02630884bc64b9af44ccfdf6 100644 (file)
--- a/tools/doc_extract.c
+++ b/tools/doc_extract.c
@@ -1,81 +1,74 @@
 /* This merely extracts, doesn't do XML or anything. */
 #include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdbool.h>
-#include "talloc/talloc.h"
-#include "string/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"
 
-/* This version adds one byte (for nul term) */
-static void *grab_file(void *ctx, const char *filename)
+int main(int argc, char *argv[])
 {
-       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);
+       unsigned int i;
+       const char *type;
+       const char *function = NULL;
 
-       if (fd < 0)
-               return NULL;
+       if (argc < 3)
+               errx(1, "Usage: doc_extract [--function=<funcname>] TYPE <file>...\n"
+                    "Where TYPE is functions|author|licence|maintainer|summary|description|example|all");
 
-       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 (strstarts(argv[1], "--function=")) {
+               function = argv[1] + strlen("--function=");
+               argv++;
+               argc--;
        }
-       if (ret < 0) {
-               talloc_free(buffer);
-               buffer = NULL;
-       } else
-               buffer[size] = '\0';
-       close(fd);
-       return buffer;
-}
-
-int main(int argc, char *argv[])
-{
-       unsigned int i, j;
 
-       for (i = 1; i < argc; i++) {
-               char *file;
-               char **lines;
-               bool printing = false, printed = false;
+       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]);
+               file = grab_file(NULL, argv[i], NULL);
                if (!file)
                        err(1, "Reading file %s", argv[i]);
-               lines = strsplit(file, file, "\n", NULL);
+               lines = strsplit(file, file, "\n", &num);
+
+               list = extract_doc_sections(lines, num);
+               if (list_empty(list))
+                       errx(1, "No documentation in file %s", argv[i]);
+               talloc_free(file);
 
-               for (j = 0; lines[j]; j++) {
-                       if (streq(lines[j], "/**")) {
-                               printing = true;
-                               if (printed++)
-                                       puts("\n");
-                       } else if (streq(lines[j], " */"))
-                               printing = false;
-                       else if (printing) {
-                               if (strstarts(lines[j], " * "))
-                                       puts(lines[j] + 3);
-                               else if (strstarts(lines[j], " *"))
-                                       puts(lines[j] + 2);
-                               else
-                                       errx(1, "Malformed line %s:%u",
-                                            argv[i], j);
+               if (streq(type, "functions")) {
+                       const char *last = NULL;
+                       list_for_each(list, d, list) {
+                               if (d->function) {
+                                       if (!last || !streq(d->function, last))
+                                               printf("%s\n", d->function);
+                                       last = d->function;
+                               }
+                       }
+               } else {
+                       unsigned int j;
+                       list_for_each(list, d, list) {
+                               if (function) {
+                                       if (!d->function)
+                                               continue;
+                                       if (!streq(d->function, function))
+                                               continue;
+                               }
+                               if (streq(type, "all"))
+                                       printf("%s:\n", d->type);
+                               else if (!streq(d->type, type))
+                                       continue;
+
+                               for (j = 0; j < d->num_lines; j++)
+                                       printf("%s\n", d->lines[j]);
                        }
                }
-               talloc_free(file);
+               talloc_free(list);
        }
        return 0;
 }
-
-               
-