diff options
| -rw-r--r-- | dba.c | 5 | ||||
| -rw-r--r-- | dba_read.c | 7 |
2 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $Id: dba.c,v 1.6 2016/08/17 18:10:39 schwarze Exp $ */ +/* $Id: dba.c,v 1.7 2016/08/17 18:59:37 schwarze Exp $ */ /* * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> * @@ -143,7 +143,8 @@ dba_page_new(struct dba_array *pages, const char *name, const char *sect, page = dba_array_new(DBP_MAX, 0); entry = dba_array_new(1, DBA_STR | DBA_GROW); - dba_array_add(entry, prepend(name, NAME_FILE & NAME_MASK)); + if (name != NULL) + dba_array_add(entry, prepend(name, NAME_FILE & NAME_MASK)); dba_array_add(page, entry); entry = dba_array_new(1, DBA_STR | DBA_GROW); dba_array_add(entry, (void *)sect); @@ -1,4 +1,4 @@ -/* $Id: dba_read.c,v 1.2 2016/08/04 09:33:57 schwarze Exp $ */ +/* $Id: dba_read.c,v 1.3 2016/08/17 18:59:37 schwarze Exp $ */ /* * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> * @@ -48,10 +48,9 @@ dba_read(const char *fname) dba = dba_new(npages < 128 ? 128 : npages); for (ip = 0; ip < npages; ip++) { pdata = dbm_page_get(ip); - page = dba_page_new(dba->pages, pdata->name, pdata->sect, + page = dba_page_new(dba->pages, NULL, pdata->sect, pdata->arch, pdata->desc, pdata->file + 1, *pdata->file); - cp = pdata->name; - while (*(cp = strchr(cp, '\0') + 1) != '\0') + for (cp = pdata->name; *cp != '\0'; cp = strchr(cp, '\0') + 1) dba_page_add(page, DBP_NAME, cp); cp = pdata->sect; while (*(cp = strchr(cp, '\0') + 1) != '\0') |