version 1.91, 2013/12/31 18:07:42 |
version 1.93, 2014/01/02 18:52:15 |
Line 143 static void *hash_alloc(size_t, void *); |
|
Line 143 static void *hash_alloc(size_t, void *); |
|
static void hash_free(void *, size_t, void *); |
static void hash_free(void *, size_t, void *); |
static void *hash_halloc(size_t, void *); |
static void *hash_halloc(size_t, void *); |
static void mlink_add(struct mlink *, const struct stat *); |
static void mlink_add(struct mlink *, const struct stat *); |
|
static int mlink_check(struct mpage *, struct mlink *); |
static void mlink_free(struct mlink *); |
static void mlink_free(struct mlink *); |
static void mlinks_undupe(struct mpage *); |
static void mlinks_undupe(struct mpage *); |
static void mpages_free(void); |
static void mpages_free(void); |
Line 154 static int parse_mdoc_body(struct mpage *, const stru |
|
Line 155 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 215 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 223 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 */ |
|
|
} |
} |
} |
} |
|
|
|
static int |
|
mlink_check(struct mpage *mpage, struct mlink *mlink) |
|
{ |
|
int match; |
|
|
|
match = 1; |
|
|
|
/* |
|
* Check whether the manual section given in a file |
|
* agrees with the directory where the file is located. |
|
* Some manuals have suffixes like (3p) on their |
|
* section number either inside the file or in the |
|
* directory name, some are linked into more than one |
|
* section, like encrypt(1) = makekey(8). |
|
*/ |
|
|
|
if (FORM_SRC == mpage->form && |
|
strcasecmp(mpage->sec, mlink->dsec)) { |
|
match = 0; |
|
say(mlink->file, "Section \"%s\" manual in %s directory", |
|
mpage->sec, mlink->dsec); |
|
} |
|
|
|
/* |
|
* Manual page directories exist for each kernel |
|
* architecture as returned by machine(1). |
|
* However, many manuals only depend on the |
|
* application architecture as returned by arch(1). |
|
* For example, some (2/ARM) manuals are shared |
|
* across the "armish" and "zaurus" kernel |
|
* architectures. |
|
* A few manuals are even shared across completely |
|
* different architectures, for example fdformat(1) |
|
* on amd64, i386, sparc, and sparc64. |
|
*/ |
|
|
|
if (strcasecmp(mpage->arch, mlink->arch)) { |
|
match = 0; |
|
say(mlink->file, "Architecture \"%s\" manual in " |
|
"\"%s\" directory", mpage->arch, mlink->arch); |
|
} |
|
|
|
if (strcasecmp(mpage->title, mlink->name)) |
|
match = 0; |
|
|
|
return(match); |
|
} |
|
|
/* |
/* |
* Run through the files in the global vector "mpages" |
* Run through the files in the global vector "mpages" |
* and add them to the database specified in "basedir". |
* and add them to the database specified in "basedir". |
Line 900 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 947 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
struct ohash title_table; |
struct ohash title_table; |
struct ohash_info title_info, str_info; |
struct ohash_info title_info, str_info; |
struct mpage *mpage; |
struct mpage *mpage; |
|
struct mlink *mlink; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct man *man; |
struct man *man; |
struct title *title_entry; |
struct title *title_entry; |
Line 934 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 982 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
mparse_reset(mp); |
mparse_reset(mp); |
mdoc = NULL; |
mdoc = NULL; |
man = NULL; |
man = NULL; |
match = 1; |
|
|
|
/* |
/* |
* Try interpreting the file as mdoc(7) or man(7) |
* Try interpreting the file as mdoc(7) or man(7) |
Line 975 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1022 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
mandoc_strdup(mpage->mlinks->name); |
mandoc_strdup(mpage->mlinks->name); |
} |
} |
|
|
/* |
for (mlink = mpage->mlinks; mlink; mlink = mlink->next) |
* Check whether the manual section given in a file |
putkey(mpage, mlink->name, TYPE_Nm); |
* agrees with the directory where the file is located. |
|
* Some manuals have suffixes like (3p) on their |
|
* section number either inside the file or in the |
|
* directory name, some are linked into more than one |
|
* section, like encrypt(1) = makekey(8). Do not skip |
|
* manuals for such reasons. |
|
*/ |
|
if (warnings && !use_all && FORM_SRC == mpage->form && |
|
strcasecmp(mpage->sec, mpage->mlinks->dsec)) { |
|
match = 0; |
|
say(mpage->mlinks->file, "Section \"%s\" " |
|
"manual in %s directory", |
|
mpage->sec, mpage->mlinks->dsec); |
|
} |
|
|
|
/* |
if (warnings && !use_all) { |
* Manual page directories exist for each kernel |
|
* architecture as returned by machine(1). |
|
* However, many manuals only depend on the |
|
* application architecture as returned by arch(1). |
|
* For example, some (2/ARM) manuals are shared |
|
* across the "armish" and "zaurus" kernel |
|
* architectures. |
|
* A few manuals are even shared across completely |
|
* different architectures, for example fdformat(1) |
|
* on amd64, i386, sparc, and sparc64. |
|
* Thus, warn about architecture mismatches, |
|
* but don't skip manuals for this reason. |
|
*/ |
|
if (warnings && !use_all && |
|
strcasecmp(mpage->arch, mpage->mlinks->arch)) { |
|
match = 0; |
match = 0; |
say(mpage->mlinks->file, "Architecture \"%s\" " |
for (mlink = mpage->mlinks; mlink; |
"manual in \"%s\" directory", |
mlink = mlink->next) |
mpage->arch, mpage->mlinks->arch); |
if (mlink_check(mpage, mlink)) |
} |
match = 1; |
if (warnings && !use_all && |
} else |
strcasecmp(mpage->title, mpage->mlinks->name)) |
match = 1; |
match = 0; |
|
|
|
putkey(mpage, mpage->mlinks->name, TYPE_Nm); |
|
|
|
if (NULL != mdoc) { |
if (NULL != mdoc) { |
if (NULL != (cp = mdoc_meta(mdoc)->name)) |
if (NULL != (cp = mdoc_meta(mdoc)->name)) |
putkey(mpage, cp, TYPE_Nm); |
putkey(mpage, cp, TYPE_Nm); |
Line 1441 parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_n |
|
Line 1456 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 1489 parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_n |
|
Line 1493 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 |