version 1.239, 2017/01/27 01:04:25 |
version 1.240, 2017/01/27 01:09:14 |
Line 1153 mpages_merge(struct dba *dba, struct mparse *mp) |
|
Line 1153 mpages_merge(struct dba *dba, struct mparse *mp) |
|
if (mlink->dform != FORM_CAT || mlink->fform != FORM_CAT) { |
if (mlink->dform != FORM_CAT || mlink->fform != FORM_CAT) { |
mparse_readfd(mp, fd, mlink->file); |
mparse_readfd(mp, fd, mlink->file); |
close(fd); |
close(fd); |
|
fd = -1; |
mparse_result(mp, &man, &sodest); |
mparse_result(mp, &man, &sodest); |
} |
} |
|
|
Line 1209 mpages_merge(struct dba *dba, struct mparse *mp) |
|
Line 1210 mpages_merge(struct dba *dba, struct mparse *mp) |
|
mpage->title = mandoc_strdup(man->meta.title); |
mpage->title = mandoc_strdup(man->meta.title); |
} else if (man != NULL && man->macroset == MACROSET_MAN) { |
} else if (man != NULL && man->macroset == MACROSET_MAN) { |
man_validate(man); |
man_validate(man); |
mpage->form = FORM_SRC; |
if (*man->meta.msec != '\0' || |
mpage->sec = mandoc_strdup(man->meta.msec); |
*man->meta.msec != '\0') { |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->form = FORM_SRC; |
mpage->title = mandoc_strdup(man->meta.title); |
mpage->sec = mandoc_strdup(man->meta.msec); |
} else { |
mpage->arch = mandoc_strdup(mlink->arch); |
|
mpage->title = mandoc_strdup(man->meta.title); |
|
} else |
|
man = NULL; |
|
} |
|
|
|
assert(mpage->desc == NULL); |
|
if (man == NULL) { |
mpage->form = FORM_CAT; |
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); |
|
} else if (man->macroset == MACROSET_MDOC) |
assert(mpage->desc == NULL); |
|
if (man != NULL && man->macroset == MACROSET_MDOC) |
|
parse_mdoc(mpage, &man->meta, man->first); |
parse_mdoc(mpage, &man->meta, man->first); |
else if (man != NULL) |
|
parse_man(mpage, &man->meta, man->first); |
|
else |
else |
parse_cat(mpage, fd); |
parse_man(mpage, &man->meta, man->first); |
if (mpage->desc == NULL) |
if (mpage->desc == NULL) |
mpage->desc = mandoc_strdup(mpage->mlinks->name); |
mpage->desc = mandoc_strdup(mpage->mlinks->name); |
|
|