In man(1) mode, properly clean up the resn[] result array

[mandoc.git] / dba_read.c

diff --git a/dba_read.c b/dba_read.c
index 67d8d8674b55c6586c299a0bbc14a31f92a2ca3c..4fc3ee5eddcb49076ff6445f495aa1cee257068b 100644 (file)
--- a/dba_read.c
+++ b/dba_read.c
@@ -1,4 +1,4 @@
-/*     $Id: dba_read.c,v 1.1 2016/07/19 21:31:55 schwarze Exp $ */
+/* $Id: dba_read.c,v 1.5 2020/06/22 19:20:40 schwarze Exp $ */

 /*
  * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
  *
 /*
  * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
  *


@@ -19,6 +19,8 @@
  * The interface is defined in "dba.h".
  * This file is seperate from dba.c because this also uses "dbm.h".
  */
  * The interface is defined in "dba.h".
  * This file is seperate from dba.c because this also uses "dbm.h".
  */

+#include "config.h"
+

 #include <regex.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <regex.h>
 #include <stdint.h>
 #include <stdlib.h>


@@ -45,16 +47,14 @@ dba_read(const char *fname)
        if (dbm_open(fname) == -1)
                return NULL;
        npages = dbm_page_count();
        if (dbm_open(fname) == -1)
                return NULL;
        npages = dbm_page_count();

-       dba = dba_new(npages);
+       dba = dba_new(npages < 128 ? 128 : npages);

        for (ip = 0; ip < npages; ip++) {
                pdata = dbm_page_get(ip);
        for (ip = 0; ip < npages; ip++) {
                pdata = dbm_page_get(ip);

-               page = dba_page_new(dba->pages, pdata->name, pdata->sect,
-                   pdata->arch, pdata->desc, pdata->file + 1, *pdata->file);
-               cp = pdata->name;
-               while (*(cp = strchr(cp, '\0') + 1) != '\0')
+               page = dba_page_new(dba->pages, pdata->arch,
+                   pdata->desc, pdata->file + 1, *pdata->file);
+               for (cp = pdata->name; *cp != '\0'; cp = strchr(cp, '\0') + 1)

                        dba_page_add(page, DBP_NAME, cp);
                        dba_page_add(page, DBP_NAME, cp);

-               cp = pdata->sect;
-               while (*(cp = strchr(cp, '\0') + 1) != '\0')
+               for (cp = pdata->sect; *cp != '\0'; cp = strchr(cp, '\0') + 1)

                        dba_page_add(page, DBP_SECT, cp);
                if ((cp = pdata->arch) != NULL)
                        while (*(cp = strchr(cp, '\0') + 1) != '\0')
                        dba_page_add(page, DBP_SECT, cp);
                if ((cp = pdata->arch) != NULL)
                        while (*(cp = strchr(cp, '\0') + 1) != '\0')