version 1.89, 2013/12/27 20:35:51 |
version 1.92, 2013/12/31 19:40:20 |
Line 154 static int parse_mdoc_body(struct mpage *, const stru |
|
Line 154 static int parse_mdoc_body(struct mpage *, const stru |
|
static int parse_mdoc_head(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_head(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Fd(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Fd(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Fn(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Fn(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_In(struct mpage *, const struct mdoc_node *); |
|
static int parse_mdoc_Nd(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Nd(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Nm(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Nm(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Sh(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Sh(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_St(struct mpage *, const struct mdoc_node *); |
|
static int parse_mdoc_Xr(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Xr(struct mpage *, const struct mdoc_node *); |
static void putkey(const struct mpage *, |
static void putkey(const struct mpage *, |
const char *, uint64_t); |
const char *, uint64_t); |
Line 216 static const struct mdoc_handler mdocs[MDOC_MAX] = { |
|
Line 214 static const struct mdoc_handler mdocs[MDOC_MAX] = { |
|
{ parse_mdoc_Fn, 0 }, /* Fn */ |
{ parse_mdoc_Fn, 0 }, /* Fn */ |
{ NULL, TYPE_Ft }, /* Ft */ |
{ NULL, TYPE_Ft }, /* Ft */ |
{ NULL, TYPE_Ic }, /* Ic */ |
{ NULL, TYPE_Ic }, /* Ic */ |
{ parse_mdoc_In, TYPE_In }, /* In */ |
{ NULL, TYPE_In }, /* In */ |
{ NULL, TYPE_Li }, /* Li */ |
{ NULL, TYPE_Li }, /* Li */ |
{ parse_mdoc_Nd, TYPE_Nd }, /* Nd */ |
{ parse_mdoc_Nd, TYPE_Nd }, /* Nd */ |
{ parse_mdoc_Nm, TYPE_Nm }, /* Nm */ |
{ parse_mdoc_Nm, TYPE_Nm }, /* Nm */ |
Line 224 static const struct mdoc_handler mdocs[MDOC_MAX] = { |
|
Line 222 static const struct mdoc_handler mdocs[MDOC_MAX] = { |
|
{ NULL, 0 }, /* Ot */ |
{ NULL, 0 }, /* Ot */ |
{ NULL, TYPE_Pa }, /* Pa */ |
{ NULL, TYPE_Pa }, /* Pa */ |
{ NULL, 0 }, /* Rv */ |
{ NULL, 0 }, /* Rv */ |
{ parse_mdoc_St, 0 }, /* St */ |
{ NULL, TYPE_St }, /* St */ |
{ NULL, TYPE_Va }, /* Va */ |
{ NULL, TYPE_Va }, /* Va */ |
{ parse_mdoc_body, TYPE_Va }, /* Vt */ |
{ parse_mdoc_body, TYPE_Va }, /* Vt */ |
{ parse_mdoc_Xr, 0 }, /* Xr */ |
{ parse_mdoc_Xr, 0 }, /* Xr */ |
Line 855 mlinks_undupe(struct mpage *mpage) |
|
Line 853 mlinks_undupe(struct mpage *mpage) |
|
char *bufp; |
char *bufp; |
|
|
mpage->form = FORM_CAT; |
mpage->form = FORM_CAT; |
for(prev = &mpage->mlinks; *prev; prev = &(*prev)->next) { |
prev = &mpage->mlinks; |
mlink = *prev; |
while (NULL != (mlink = *prev)) { |
if (FORM_CAT != mlink->dform) { |
if (FORM_CAT != mlink->dform) { |
mpage->form = FORM_NONE; |
mpage->form = FORM_NONE; |
continue; |
goto nextlink; |
} |
} |
if (strlcpy(buf, mlink->file, PATH_MAX) >= PATH_MAX) { |
if (strlcpy(buf, mlink->file, PATH_MAX) >= PATH_MAX) { |
if (warnings) |
if (warnings) |
say(mlink->file, "Filename too long"); |
say(mlink->file, "Filename too long"); |
continue; |
goto nextlink; |
} |
} |
bufp = strstr(buf, "cat"); |
bufp = strstr(buf, "cat"); |
assert(NULL != bufp); |
assert(NULL != bufp); |
Line 874 mlinks_undupe(struct mpage *mpage) |
|
Line 872 mlinks_undupe(struct mpage *mpage) |
|
strlcat(buf, mlink->dsec, PATH_MAX); |
strlcat(buf, mlink->dsec, PATH_MAX); |
if (NULL == ohash_find(&mlinks, |
if (NULL == ohash_find(&mlinks, |
ohash_qlookup(&mlinks, buf))) |
ohash_qlookup(&mlinks, buf))) |
continue; |
goto nextlink; |
if (warnings) |
if (warnings) |
say(mlink->file, "Man source exists: %s", buf); |
say(mlink->file, "Man source exists: %s", buf); |
if (use_all) |
if (use_all) |
continue; |
goto nextlink; |
*prev = mlink->next; |
*prev = mlink->next; |
mlink_free(mlink); |
mlink_free(mlink); |
mlink = *prev; |
continue; |
|
nextlink: |
|
prev = &(*prev)->next; |
} |
} |
} |
} |
|
|
Line 1439 parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_n |
|
Line 1439 parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_n |
|
|
|
if (end > start) |
if (end > start) |
putkeys(mpage, start, end - start + 1, TYPE_In); |
putkeys(mpage, start, end - start + 1, TYPE_In); |
return(1); |
return(0); |
} |
} |
|
|
static int |
static int |
parse_mdoc_In(struct mpage *mpage, const struct mdoc_node *n) |
|
{ |
|
|
|
if (NULL != n->child && MDOC_TEXT == n->child->type) |
|
return(0); |
|
|
|
putkey(mpage, n->child->string, TYPE_In); |
|
return(1); |
|
} |
|
|
|
static int |
|
parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_node *n) |
parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_node *n) |
{ |
{ |
const char *cp; |
const char *cp; |
Line 1487 parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_n |
|
Line 1476 parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_n |
|
} |
} |
|
|
static int |
static int |
parse_mdoc_St(struct mpage *mpage, const struct mdoc_node *n) |
|
{ |
|
|
|
if (NULL == n->child || MDOC_TEXT != n->child->type) |
|
return(0); |
|
|
|
putkey(mpage, n->child->string, TYPE_St); |
|
return(1); |
|
} |
|
|
|
static int |
|
parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_node *n) |
parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_node *n) |
{ |
{ |
char *cp; |
char *cp; |
|
|
parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_node *n) |
parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_node *n) |
{ |
{ |
|
|
if (SEC_NAME == n->sec) |
return(SEC_NAME == n->sec || |
return(1); |
(SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type)); |
else if (SEC_SYNOPSIS != n->sec || MDOC_HEAD != n->type) |
|
return(0); |
|
|
|
return(1); |
|
} |
} |
|
|
static int |
static int |
Line 1732 utf8key(struct mchars *mc, struct str *key) |
|
Line 1706 utf8key(struct mchars *mc, struct str *key) |
|
/* Read past the slash. */ |
/* Read past the slash. */ |
|
|
val++; |
val++; |
u = 0; |
|
|
|
/* |
/* |
* Parse the escape sequence and see if it's a |
* Parse the escape sequence and see if it's a |