version 1.81, 2013/12/27 01:16:54 |
version 1.82, 2013/12/27 03:06:17 |
|
|
|
|
struct mpage { |
struct mpage { |
struct inodev inodev; /* used for hashing routine */ |
struct inodev inodev; /* used for hashing routine */ |
enum form dform; /* path-cued form */ |
enum form form; /* format from file content */ |
enum form sform; /* suffix-cued form */ |
char *sec; /* section from file content */ |
|
char *arch; /* architecture from file content */ |
|
char *title; /* title from file content */ |
|
char *desc; /* description from file content */ |
|
struct mlink *mlinks; /* singly linked list */ |
|
}; |
|
|
|
struct mlink { |
char file[PATH_MAX]; /* filename rel. to manpath */ |
char file[PATH_MAX]; /* filename rel. to manpath */ |
char *desc; /* parsed description */ |
enum form dform; /* format from directory */ |
char *name; /* name (from filename) (not empty) */ |
enum form sform; /* format from file name suffix */ |
char *sec; /* suffix-cued section (or empty) */ |
char *dsec; /* section from directory */ |
char *dsec; /* path-cued section (or empty) */ |
char *arch; /* architecture from directory */ |
char *arch; /* path-cued arch. (or empty) */ |
char *name; /* name from file name (not empty) */ |
|
char *fsec; /* section from file name suffix */ |
}; |
}; |
|
|
struct title { |
struct title { |
Line 126 struct mdoc_handler { |
|
Line 134 struct mdoc_handler { |
|
}; |
}; |
|
|
static void dbclose(int); |
static void dbclose(int); |
static void dbindex(struct mchars *, int, const struct mpage *); |
static void dbindex(const struct mpage *, struct mchars *); |
static int dbopen(int); |
static int dbopen(int); |
static void dbprune(void); |
static void dbprune(void); |
static void fileadd(struct mpage *); |
static void fileadd(struct mlink *); |
static int filecheck(const char *); |
static int filecheck(const char *); |
static void filescan(const char *); |
static void filescan(const char *); |
static void *hash_alloc(size_t, void *); |
static void *hash_alloc(size_t, void *); |
Line 139 static void inoadd(const struct stat *, struct mpage |
|
Line 147 static void inoadd(const struct stat *, struct mpage |
|
static int inocheck(const struct stat *); |
static int inocheck(const struct stat *); |
static void ofadd(int, const char *, const char *, const char *, |
static void ofadd(int, const char *, const char *, const char *, |
const char *, const char *, const struct stat *); |
const char *, const char *, const struct stat *); |
|
static void mlink_free(struct mlink *); |
static void mpages_free(void); |
static void mpages_free(void); |
static void mpages_merge(struct mchars *, struct mparse *, int); |
static void mpages_merge(struct mchars *, struct mparse *, int); |
static void parse_cat(struct mpage *); |
static void parse_cat(struct mpage *); |
Line 324 main(int argc, char *argv[]) |
|
Line 333 main(int argc, char *argv[]) |
|
mpages_info.hfree = filename_info.hfree = hash_free; |
mpages_info.hfree = filename_info.hfree = hash_free; |
|
|
mpages_info.key_offset = offsetof(struct mpage, inodev); |
mpages_info.key_offset = offsetof(struct mpage, inodev); |
filename_info.key_offset = offsetof(struct mpage, file); |
filename_info.key_offset = offsetof(struct mlink, file); |
|
|
progname = strrchr(argv[0], '/'); |
progname = strrchr(argv[0], '/'); |
if (progname == NULL) |
if (progname == NULL) |
Line 771 filecheck(const char *name) |
|
Line 780 filecheck(const char *name) |
|
* already exists. |
* already exists. |
*/ |
*/ |
static void |
static void |
fileadd(struct mpage *mpage) |
fileadd(struct mlink *mlink) |
{ |
{ |
unsigned int slot; |
unsigned int slot; |
|
|
slot = ohash_qlookup(&filenames, mpage->file); |
slot = ohash_qlookup(&filenames, mlink->file); |
assert(NULL == ohash_find(&filenames, slot)); |
assert(NULL == ohash_find(&filenames, slot)); |
ohash_insert(&filenames, slot, mpage); |
ohash_insert(&filenames, slot, mlink); |
} |
} |
|
|
/* |
/* |
Line 821 ofadd(int dform, const char *file, const char *name, c |
|
Line 830 ofadd(int dform, const char *file, const char *name, c |
|
const char *sec, const char *arch, const struct stat *st) |
const char *sec, const char *arch, const struct stat *st) |
{ |
{ |
struct mpage *mpage; |
struct mpage *mpage; |
|
struct mlink *mlink; |
int sform; |
int sform; |
|
|
assert(NULL != file); |
assert(NULL != file); |
Line 842 ofadd(int dform, const char *file, const char *name, c |
|
Line 852 ofadd(int dform, const char *file, const char *name, c |
|
else |
else |
sform = FORM_NONE; |
sform = FORM_NONE; |
|
|
|
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
|
strlcpy(mlink->file, file, PATH_MAX); |
|
mlink->dform = dform; |
|
mlink->sform = sform; |
|
mlink->dsec = mandoc_strdup(dsec); |
|
mlink->arch = mandoc_strdup(arch); |
|
mlink->name = mandoc_strdup(name); |
|
mlink->fsec = mandoc_strdup(sec); |
|
|
mpage = mandoc_calloc(1, sizeof(struct mpage)); |
mpage = mandoc_calloc(1, sizeof(struct mpage)); |
strlcpy(mpage->file, file, PATH_MAX); |
mpage->mlinks = mlink; |
mpage->name = mandoc_strdup(name); |
|
mpage->sec = mandoc_strdup(sec); |
|
mpage->dsec = mandoc_strdup(dsec); |
|
mpage->arch = mandoc_strdup(arch); |
|
mpage->sform = sform; |
|
mpage->dform = dform; |
|
|
|
/* |
/* |
* Add to unique identifier hash. |
* Add to unique identifier hash. |
Line 857 ofadd(int dform, const char *file, const char *name, c |
|
Line 870 ofadd(int dform, const char *file, const char *name, c |
|
* favour of catpages, add it to that hash. |
* favour of catpages, add it to that hash. |
*/ |
*/ |
inoadd(st, mpage); |
inoadd(st, mpage); |
fileadd(mpage); |
fileadd(mpage->mlinks); |
} |
} |
|
|
static void |
static void |
|
mlink_free(struct mlink *mlink) |
|
{ |
|
|
|
free(mlink->dsec); |
|
free(mlink->arch); |
|
free(mlink->name); |
|
free(mlink->fsec); |
|
free(mlink); |
|
} |
|
|
|
static void |
mpages_free(void) |
mpages_free(void) |
{ |
{ |
struct mpage *mpage; |
struct mpage *mpage; |
|
struct mlink *mlink; |
unsigned int slot; |
unsigned int slot; |
|
|
mpage = ohash_first(&mpages, &slot); |
mpage = ohash_first(&mpages, &slot); |
while (NULL != mpage) { |
while (NULL != mpage) { |
free(mpage->name); |
while (NULL != (mlink = mpage->mlinks)) { |
|
mpage->mlinks = NULL; |
|
mlink_free(mlink); |
|
} |
free(mpage->sec); |
free(mpage->sec); |
free(mpage->dsec); |
|
free(mpage->arch); |
free(mpage->arch); |
|
free(mpage->title); |
|
free(mpage->desc); |
free(mpage); |
free(mpage); |
mpage = ohash_next(&mpages, &slot); |
mpage = ohash_next(&mpages, &slot); |
} |
} |
Line 895 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 924 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
struct man *man; |
struct man *man; |
struct title *title_entry; |
struct title *title_entry; |
char *bufp, *title_str; |
char *bufp, *title_str; |
const char *msec, *march, *mtitle, *cp; |
const char *cp; |
size_t sz; |
size_t sz; |
int form; |
|
int match; |
int match; |
unsigned int pslot, tslot; |
unsigned int pslot, tslot; |
enum mandoclevel lvl; |
enum mandoclevel lvl; |
Line 924 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 952 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
* If it does, then we want to use it instead of our |
* If it does, then we want to use it instead of our |
* own. |
* own. |
*/ |
*/ |
if ( ! use_all && FORM_CAT == mpage->dform) { |
if ( ! use_all && FORM_CAT == mpage->mlinks->dform) { |
sz = strlcpy(buf, mpage->file, PATH_MAX); |
sz = strlcpy(buf, mpage->mlinks->file, PATH_MAX); |
if (sz >= PATH_MAX) { |
if (sz >= PATH_MAX) { |
if (warnings) |
if (warnings) |
say(mpage->file, |
say(mpage->mlinks->file, |
"Filename too long"); |
"Filename too long"); |
mpage = ohash_next(&mpages, &pslot); |
mpage = ohash_next(&mpages, &pslot); |
continue; |
continue; |
Line 938 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 966 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
memcpy(bufp, "man", 3); |
memcpy(bufp, "man", 3); |
if (NULL != (bufp = strrchr(buf, '.'))) |
if (NULL != (bufp = strrchr(buf, '.'))) |
*++bufp = '\0'; |
*++bufp = '\0'; |
strlcat(buf, mpage->dsec, PATH_MAX); |
strlcat(buf, mpage->mlinks->dsec, PATH_MAX); |
if (filecheck(buf)) { |
if (filecheck(buf)) { |
if (warnings) |
if (warnings) |
say(mpage->file, "Man " |
say(mpage->mlinks->file, "Man " |
"source exists: %s", buf); |
"source exists: %s", buf); |
mpage = ohash_next(&mpages, &pslot); |
mpage = ohash_next(&mpages, &pslot); |
continue; |
continue; |
Line 959 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 987 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
* source code, unless it is already known to be |
* source code, unless it is already known to be |
* formatted. Fall back to formatted mode. |
* formatted. Fall back to formatted mode. |
*/ |
*/ |
if (FORM_CAT != mpage->dform || FORM_CAT != mpage->sform) { |
if (FORM_CAT != mpage->mlinks->dform || |
lvl = mparse_readfd(mp, -1, mpage->file); |
FORM_CAT != mpage->mlinks->sform) { |
|
lvl = mparse_readfd(mp, -1, mpage->mlinks->file); |
if (lvl < MANDOCLEVEL_FATAL) |
if (lvl < MANDOCLEVEL_FATAL) |
mparse_result(mp, &mdoc, &man); |
mparse_result(mp, &mdoc, &man); |
} |
} |
|
|
if (NULL != mdoc) { |
if (NULL != mdoc) { |
form = 1; |
mpage->form = FORM_SRC; |
msec = mdoc_meta(mdoc)->msec; |
mpage->sec = |
march = mdoc_meta(mdoc)->arch; |
mandoc_strdup(mdoc_meta(mdoc)->msec); |
mtitle = mdoc_meta(mdoc)->title; |
mpage->arch = mdoc_meta(mdoc)->arch; |
|
if (NULL == mpage->arch) |
|
mpage->arch = ""; |
|
mpage->arch = mandoc_strdup(mpage->arch); |
|
mpage->title = |
|
mandoc_strdup(mdoc_meta(mdoc)->title); |
} else if (NULL != man) { |
} else if (NULL != man) { |
form = 1; |
mpage->form = FORM_SRC; |
msec = man_meta(man)->msec; |
mpage->sec = |
march = mpage->arch; |
mandoc_strdup(man_meta(man)->msec); |
mtitle = man_meta(man)->title; |
mpage->arch = |
|
mandoc_strdup(mpage->mlinks->arch); |
|
mpage->title = |
|
mandoc_strdup(man_meta(man)->title); |
} else { |
} else { |
form = 0; |
mpage->form = FORM_CAT; |
msec = mpage->dsec; |
mpage->sec = |
march = mpage->arch; |
mandoc_strdup(mpage->mlinks->dsec); |
mtitle = mpage->name; |
mpage->arch = |
|
mandoc_strdup(mpage->mlinks->arch); |
|
mpage->title = |
|
mandoc_strdup(mpage->mlinks->name); |
} |
} |
|
|
if (NULL == msec) |
|
msec = ""; |
|
if (NULL == march) |
|
march = ""; |
|
if (NULL == mtitle) |
|
mtitle = ""; |
|
|
|
/* |
/* |
* Check whether the manual section given in a file |
* Check whether the manual section given in a file |
* agrees with the directory where the file is located. |
* agrees with the directory where the file is located. |
Line 998 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1031 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
* section, like encrypt(1) = makekey(8). Do not skip |
* section, like encrypt(1) = makekey(8). Do not skip |
* manuals for such reasons. |
* manuals for such reasons. |
*/ |
*/ |
if (warnings && !use_all && form && |
if (warnings && !use_all && FORM_SRC == mpage->form && |
strcasecmp(msec, mpage->dsec)) { |
strcasecmp(mpage->sec, mpage->mlinks->dsec)) { |
match = 0; |
match = 0; |
say(mpage->file, "Section \"%s\" " |
say(mpage->mlinks->file, "Section \"%s\" " |
"manual in %s directory", |
"manual in %s directory", |
msec, mpage->dsec); |
mpage->sec, mpage->mlinks->dsec); |
} |
} |
|
|
/* |
/* |
Line 1020 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1053 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
* Thus, warn about architecture mismatches, |
* Thus, warn about architecture mismatches, |
* but don't skip manuals for this reason. |
* but don't skip manuals for this reason. |
*/ |
*/ |
if (warnings && !use_all && strcasecmp(march, mpage->arch)) { |
if (warnings && !use_all && |
|
strcasecmp(mpage->arch, mpage->mlinks->arch)) { |
match = 0; |
match = 0; |
say(mpage->file, "Architecture \"%s\" " |
say(mpage->mlinks->file, "Architecture \"%s\" " |
"manual in \"%s\" directory", |
"manual in \"%s\" directory", |
march, mpage->arch); |
mpage->arch, mpage->mlinks->arch); |
} |
} |
if (warnings && !use_all && strcasecmp(mtitle, mpage->name)) |
if (warnings && !use_all && |
|
strcasecmp(mpage->title, mpage->mlinks->name)) |
match = 0; |
match = 0; |
|
|
putkey(mpage, mpage->name, TYPE_Nm); |
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)) |
Line 1037 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1072 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
assert(NULL == mpage->desc); |
assert(NULL == mpage->desc); |
parse_mdoc(mpage, mdoc_node(mdoc)); |
parse_mdoc(mpage, mdoc_node(mdoc)); |
putkey(mpage, NULL != mpage->desc ? |
putkey(mpage, NULL != mpage->desc ? |
mpage->desc : mpage->name, TYPE_Nd); |
mpage->desc : mpage->mlinks->name, TYPE_Nd); |
} else if (NULL != man) |
} else if (NULL != man) |
parse_man(mpage, man_node(man)); |
parse_man(mpage, man_node(man)); |
else |
else |
Line 1050 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1085 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
*/ |
*/ |
|
|
if (check_reachable) { |
if (check_reachable) { |
if (-1 == asprintf(&title_str, "%s(%s%s%s)", mtitle, |
if (-1 == asprintf(&title_str, "%s(%s%s%s)", |
msec, '\0' == *march ? "" : "/", march)) { |
mpage->title, mpage->sec, |
|
'\0' == *mpage->arch ? "" : "/", |
|
mpage->arch)) { |
perror(NULL); |
perror(NULL); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
Line 1062 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1099 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
sizeof(struct title)); |
sizeof(struct title)); |
title_entry->title = title_str; |
title_entry->title = title_str; |
title_entry->file = mandoc_strdup( |
title_entry->file = mandoc_strdup( |
match ? "" : mpage->file); |
match ? "" : mpage->mlinks->file); |
ohash_insert(&title_table, tslot, |
ohash_insert(&title_table, tslot, |
title_entry); |
title_entry); |
} else { |
} else { |
Line 1072 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1109 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
} |
} |
} |
} |
|
|
dbindex(mc, form, mpage); |
dbindex(mpage, mc); |
ohash_delete(&strings); |
ohash_delete(&strings); |
mpage = ohash_next(&mpages, &pslot); |
mpage = ohash_next(&mpages, &pslot); |
} |
} |
Line 1100 parse_cat(struct mpage *mpage) |
|
Line 1137 parse_cat(struct mpage *mpage) |
|
char *line, *p, *title; |
char *line, *p, *title; |
size_t len, plen, titlesz; |
size_t len, plen, titlesz; |
|
|
if (NULL == (stream = fopen(mpage->file, "r"))) { |
if (NULL == (stream = fopen(mpage->mlinks->file, "r"))) { |
if (warnings) |
if (warnings) |
say(mpage->file, NULL); |
say(mpage->mlinks->file, NULL); |
return; |
return; |
} |
} |
|
|
Line 1155 parse_cat(struct mpage *mpage) |
|
Line 1192 parse_cat(struct mpage *mpage) |
|
|
|
if (NULL == title || '\0' == *title) { |
if (NULL == title || '\0' == *title) { |
if (warnings) |
if (warnings) |
say(mpage->file, "Cannot find NAME section"); |
say(mpage->mlinks->file, |
|
"Cannot find NAME section"); |
assert(NULL == mpage->desc); |
assert(NULL == mpage->desc); |
mpage->desc = mandoc_strdup(mpage->name); |
mpage->desc = mandoc_strdup(mpage->mlinks->name); |
putkey(mpage, mpage->name, TYPE_Nd); |
putkey(mpage, mpage->mlinks->name, TYPE_Nd); |
fclose(stream); |
fclose(stream); |
free(title); |
free(title); |
return; |
return; |
Line 1178 parse_cat(struct mpage *mpage) |
|
Line 1216 parse_cat(struct mpage *mpage) |
|
/* Skip to next word. */ ; |
/* Skip to next word. */ ; |
} else { |
} else { |
if (warnings) |
if (warnings) |
say(mpage->file, "No dash in title line"); |
say(mpage->mlinks->file, |
|
"No dash in title line"); |
p = title; |
p = title; |
} |
} |
|
|
Line 1788 utf8key(struct mchars *mc, struct str *key) |
|
Line 1827 utf8key(struct mchars *mc, struct str *key) |
|
* Also, UTF-8-encode the description at the last possible moment. |
* Also, UTF-8-encode the description at the last possible moment. |
*/ |
*/ |
static void |
static void |
dbindex(struct mchars *mc, int form, const struct mpage *mpage) |
dbindex(const struct mpage *mpage, struct mchars *mc) |
{ |
{ |
struct str *key; |
struct str *key; |
const char *desc; |
const char *desc; |
Line 1797 dbindex(struct mchars *mc, int form, const struct mpag |
|
Line 1836 dbindex(struct mchars *mc, int form, const struct mpag |
|
unsigned int slot; |
unsigned int slot; |
|
|
if (verb) |
if (verb) |
say(mpage->file, "Adding to index"); |
say(mpage->mlinks->file, "Adding to index"); |
|
|
if (nodb) |
if (nodb) |
return; |
return; |
Line 1820 dbindex(struct mchars *mc, int form, const struct mpag |
|
Line 1859 dbindex(struct mchars *mc, int form, const struct mpag |
|
* and only kept for backward compatibility |
* and only kept for backward compatibility |
* until apropos(1) and friends have caught up. |
* until apropos(1) and friends have caught up. |
*/ |
*/ |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->file); |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->file); |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->sec); |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->dsec); |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->arch); |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->arch); |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, desc); |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, desc); |
SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, form); |
SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form); |
SQL_STEP(stmts[STMT_INSERT_PAGE]); |
SQL_STEP(stmts[STMT_INSERT_PAGE]); |
recno = sqlite3_last_insert_rowid(db); |
recno = sqlite3_last_insert_rowid(db); |
sqlite3_reset(stmts[STMT_INSERT_PAGE]); |
sqlite3_reset(stmts[STMT_INSERT_PAGE]); |
|
|
i = 1; |
i = 1; |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->sec); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->dsec); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->arch); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->arch); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->file); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->file); |
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, recno); |
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, recno); |
SQL_STEP(stmts[STMT_INSERT_LINK]); |
SQL_STEP(stmts[STMT_INSERT_LINK]); |
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
|
|
dbprune(void) |
dbprune(void) |
{ |
{ |
struct mpage *mpage; |
struct mpage *mpage; |
|
struct mlink *mlink; |
size_t i; |
size_t i; |
unsigned int slot; |
unsigned int slot; |
|
|
|
|
|
|
mpage = ohash_first(&mpages, &slot); |
mpage = ohash_first(&mpages, &slot); |
while (NULL != mpage) { |
while (NULL != mpage) { |
|
mlink = mpage->mlinks; |
i = 1; |
i = 1; |
SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE], i, mpage->file); |
SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE], i, mlink->file); |
SQL_STEP(stmts[STMT_DELETE_PAGE]); |
SQL_STEP(stmts[STMT_DELETE_PAGE]); |
sqlite3_reset(stmts[STMT_DELETE_PAGE]); |
sqlite3_reset(stmts[STMT_DELETE_PAGE]); |
if (verb) |
if (verb) |
say(mpage->file, "Deleted from index"); |
say(mlink->file, "Deleted from index"); |
mpage = ohash_next(&mpages, &slot); |
mpage = ohash_next(&mpages, &slot); |
} |
} |
} |
} |