version 1.261, 2018/12/14 01:18:26 |
version 1.263, 2019/05/03 18:17:12 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011-2019 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2016 Ed Maste <emaste@freebsd.org> |
* Copyright (c) 2016 Ed Maste <emaste@freebsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 347 mandocdb(int argc, char *argv[]) |
|
Line 347 mandocdb(int argc, char *argv[]) |
|
goto usage; \ |
goto usage; \ |
} while (/*CONSTCOND*/0) |
} while (/*CONSTCOND*/0) |
|
|
|
mparse_options = MPARSE_VALIDATE; |
path_arg = NULL; |
path_arg = NULL; |
op = OP_DEFAULT; |
op = OP_DEFAULT; |
|
|
Line 1115 mpages_merge(struct dba *dba, struct mparse *mp) |
|
Line 1116 mpages_merge(struct dba *dba, struct mparse *mp) |
|
{ |
{ |
struct mpage *mpage, *mpage_dest; |
struct mpage *mpage, *mpage_dest; |
struct mlink *mlink, *mlink_dest; |
struct mlink *mlink, *mlink_dest; |
struct roff_man *man; |
struct roff_meta *meta; |
char *sodest; |
|
char *cp; |
char *cp; |
int fd; |
int fd; |
|
|
Line 1129 mpages_merge(struct dba *dba, struct mparse *mp) |
|
Line 1129 mpages_merge(struct dba *dba, struct mparse *mp) |
|
mandoc_ohash_init(&names, 4, offsetof(struct str, key)); |
mandoc_ohash_init(&names, 4, offsetof(struct str, key)); |
mandoc_ohash_init(&strings, 6, offsetof(struct str, key)); |
mandoc_ohash_init(&strings, 6, offsetof(struct str, key)); |
mparse_reset(mp); |
mparse_reset(mp); |
man = NULL; |
meta = NULL; |
sodest = NULL; |
|
|
|
if ((fd = mparse_open(mp, mlink->file)) == -1) { |
if ((fd = mparse_open(mp, mlink->file)) == -1) { |
say(mlink->file, "&open"); |
say(mlink->file, "&open"); |
Line 1145 mpages_merge(struct dba *dba, struct mparse *mp) |
|
Line 1144 mpages_merge(struct dba *dba, struct mparse *mp) |
|
mparse_readfd(mp, fd, mlink->file); |
mparse_readfd(mp, fd, mlink->file); |
close(fd); |
close(fd); |
fd = -1; |
fd = -1; |
mparse_result(mp, &man, &sodest); |
meta = mparse_result(mp); |
} |
} |
|
|
if (sodest != NULL) { |
if (meta != NULL && meta->sodest != NULL) { |
mlink_dest = ohash_find(&mlinks, |
mlink_dest = ohash_find(&mlinks, |
ohash_qlookup(&mlinks, sodest)); |
ohash_qlookup(&mlinks, meta->sodest)); |
if (mlink_dest == NULL) { |
if (mlink_dest == NULL) { |
mandoc_asprintf(&cp, "%s.gz", sodest); |
mandoc_asprintf(&cp, "%s.gz", meta->sodest); |
mlink_dest = ohash_find(&mlinks, |
mlink_dest = ohash_find(&mlinks, |
ohash_qlookup(&mlinks, cp)); |
ohash_qlookup(&mlinks, cp)); |
free(cp); |
free(cp); |
Line 1187 mpages_merge(struct dba *dba, struct mparse *mp) |
|
Line 1186 mpages_merge(struct dba *dba, struct mparse *mp) |
|
mlink->next = mlink_dest->next; |
mlink->next = mlink_dest->next; |
mlink_dest->next = mpage->mlinks; |
mlink_dest->next = mpage->mlinks; |
mpage->mlinks = NULL; |
mpage->mlinks = NULL; |
|
goto nextpage; |
} |
} |
goto nextpage; |
meta->macroset = MACROSET_NONE; |
} else if (man != NULL && man->macroset == MACROSET_MDOC) { |
} |
mdoc_validate(man); |
if (meta != NULL && meta->macroset == MACROSET_MDOC) { |
mpage->form = FORM_SRC; |
mpage->form = FORM_SRC; |
mpage->sec = man->meta.msec; |
mpage->sec = meta->msec; |
mpage->sec = mandoc_strdup( |
mpage->sec = mandoc_strdup( |
mpage->sec == NULL ? "" : mpage->sec); |
mpage->sec == NULL ? "" : mpage->sec); |
mpage->arch = man->meta.arch; |
mpage->arch = meta->arch; |
mpage->arch = mandoc_strdup( |
mpage->arch = mandoc_strdup( |
mpage->arch == NULL ? "" : mpage->arch); |
mpage->arch == NULL ? "" : mpage->arch); |
mpage->title = mandoc_strdup(man->meta.title); |
mpage->title = mandoc_strdup(meta->title); |
} else if (man != NULL && man->macroset == MACROSET_MAN) { |
} else if (meta != NULL && meta->macroset == MACROSET_MAN) { |
man_validate(man); |
if (*meta->msec != '\0' || *meta->title != '\0') { |
if (*man->meta.msec != '\0' || |
|
*man->meta.title != '\0') { |
|
mpage->form = FORM_SRC; |
mpage->form = FORM_SRC; |
mpage->sec = mandoc_strdup(man->meta.msec); |
mpage->sec = mandoc_strdup(meta->msec); |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->title = mandoc_strdup(man->meta.title); |
mpage->title = mandoc_strdup(meta->title); |
} else |
} else |
man = NULL; |
meta = NULL; |
} |
} |
|
|
assert(mpage->desc == NULL); |
assert(mpage->desc == NULL); |
if (man == NULL) { |
if (meta == NULL || meta->sodest != NULL) { |
mpage->form = FORM_CAT; |
|
mpage->sec = mandoc_strdup(mlink->dsec); |
mpage->sec = mandoc_strdup(mlink->dsec); |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->title = mandoc_strdup(mlink->name); |
mpage->title = mandoc_strdup(mlink->name); |
parse_cat(mpage, fd); |
if (meta == NULL) { |
} else if (man->macroset == MACROSET_MDOC) |
mpage->form = FORM_CAT; |
parse_mdoc(mpage, &man->meta, man->first); |
parse_cat(mpage, fd); |
|
} else |
|
mpage->form = FORM_SRC; |
|
} else if (meta->macroset == MACROSET_MDOC) |
|
parse_mdoc(mpage, meta, meta->first); |
else |
else |
parse_man(mpage, &man->meta, man->first); |
parse_man(mpage, meta, meta->first); |
if (mpage->desc == NULL) { |
if (mpage->desc == NULL) { |
mpage->desc = mandoc_strdup(mlink->name); |
mpage->desc = mandoc_strdup(mlink->name); |
if (warnings) |
if (warnings) |