version 1.83, 2013/12/27 14:29:28 |
version 1.88, 2013/12/27 18:42:25 |
|
|
}; |
}; |
|
|
enum form { |
enum form { |
FORM_SRC, /* format is -man or -mdoc */ |
FORM_NONE, /* format is unknown */ |
FORM_CAT, /* format is cat */ |
FORM_SRC, /* format is -man or -mdoc */ |
FORM_NONE /* format is unknown */ |
FORM_CAT /* format is cat */ |
}; |
}; |
|
|
struct str { |
struct str { |
|
|
struct mlink { |
struct mlink { |
char file[PATH_MAX]; /* filename rel. to manpath */ |
char file[PATH_MAX]; /* filename rel. to manpath */ |
enum form dform; /* format from directory */ |
enum form dform; /* format from directory */ |
enum form sform; /* format from file name suffix */ |
enum form fform; /* format from file name suffix */ |
char *dsec; /* section from directory */ |
char *dsec; /* section from directory */ |
char *arch; /* architecture from directory */ |
char *arch; /* architecture from directory */ |
char *name; /* name from file name (not empty) */ |
char *name; /* name from file name (not empty) */ |
char *fsec; /* section from file name suffix */ |
char *fsec; /* section from file name suffix */ |
|
struct mlink *next; /* singly linked list */ |
}; |
}; |
|
|
struct title { |
struct title { |
Line 141 static void filescan(const char *); |
|
Line 142 static void filescan(const char *); |
|
static void *hash_alloc(size_t, void *); |
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 int inocheck(const struct stat *); |
static void mlink_add(struct mlink *, const struct stat *); |
static void mlink_add(int, const char *, const char *, const char *, |
|
const char *, const char *, const struct stat *); |
|
static void mlink_free(struct mlink *); |
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); |
|
|
{ |
{ |
FTS *f; |
FTS *f; |
FTSENT *ff; |
FTSENT *ff; |
|
struct mlink *mlink; |
int dform; |
int dform; |
char *sec; |
char *fsec; |
const char *dsec, *arch, *cp, *path; |
const char *dsec, *arch, *cp, *path; |
const char *argv[2]; |
const char *argv[2]; |
|
|
|
|
if (warnings) |
if (warnings) |
say(path, "Extraneous file"); |
say(path, "Extraneous file"); |
continue; |
continue; |
} else if (inocheck(ff->fts_statp)) { |
} else if (NULL == (fsec = |
if (warnings) |
|
say(path, "Duplicate file"); |
|
continue; |
|
} else if (NULL == (sec = |
|
strrchr(ff->fts_name, '.'))) { |
strrchr(ff->fts_name, '.'))) { |
if ( ! use_all) { |
if ( ! use_all) { |
if (warnings) |
if (warnings) |
|
|
"No filename suffix"); |
"No filename suffix"); |
continue; |
continue; |
} |
} |
} else if (0 == strcmp(++sec, "html")) { |
} else if (0 == strcmp(++fsec, "html")) { |
if (warnings) |
if (warnings) |
say(path, "Skip html"); |
say(path, "Skip html"); |
continue; |
continue; |
} else if (0 == strcmp(sec, "gz")) { |
} else if (0 == strcmp(fsec, "gz")) { |
if (warnings) |
if (warnings) |
say(path, "Skip gz"); |
say(path, "Skip gz"); |
continue; |
continue; |
} else if (0 == strcmp(sec, "ps")) { |
} else if (0 == strcmp(fsec, "ps")) { |
if (warnings) |
if (warnings) |
say(path, "Skip ps"); |
say(path, "Skip ps"); |
continue; |
continue; |
} else if (0 == strcmp(sec, "pdf")) { |
} else if (0 == strcmp(fsec, "pdf")) { |
if (warnings) |
if (warnings) |
say(path, "Skip pdf"); |
say(path, "Skip pdf"); |
continue; |
continue; |
} else if ( ! use_all && |
} else if ( ! use_all && |
((FORM_SRC == dform && strcmp(sec, dsec)) || |
((FORM_SRC == dform && strcmp(fsec, dsec)) || |
(FORM_CAT == dform && strcmp(sec, "0")))) { |
(FORM_CAT == dform && strcmp(fsec, "0")))) { |
if (warnings) |
if (warnings) |
say(path, "Wrong filename suffix"); |
say(path, "Wrong filename suffix"); |
continue; |
continue; |
} else |
} else |
sec[-1] = '\0'; |
fsec[-1] = '\0'; |
mlink_add(dform, path, ff->fts_name, dsec, sec, |
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
arch, ff->fts_statp); |
strlcpy(mlink->file, path, sizeof(mlink->file)); |
|
mlink->dform = dform; |
|
if (NULL != dsec) |
|
mlink->dsec = mandoc_strdup(dsec); |
|
if (NULL != arch) |
|
mlink->arch = mandoc_strdup(arch); |
|
mlink->name = mandoc_strdup(ff->fts_name); |
|
if (NULL != fsec) |
|
mlink->fsec = mandoc_strdup(fsec); |
|
mlink_add(mlink, ff->fts_statp); |
continue; |
continue; |
} else if (FTS_D != ff->fts_info && |
} else if (FTS_D != ff->fts_info && |
FTS_DP != ff->fts_info) { |
FTS_DP != ff->fts_info) { |
if (warnings) |
if (warnings) |
say(path, "Not a regular file"); |
say(path, "Not a regular file"); |
|
|
filescan(const char *file) |
filescan(const char *file) |
{ |
{ |
char buf[PATH_MAX]; |
char buf[PATH_MAX]; |
const char *sec, *arch, *name, *dsec; |
|
char *p, *start; |
|
int dform; |
|
struct stat st; |
struct stat st; |
|
struct mlink *mlink; |
|
char *p, *start; |
|
|
assert(use_all); |
assert(use_all); |
|
|
Line 702 filescan(const char *file) |
|
Line 706 filescan(const char *file) |
|
exitcode = (int)MANDOCLEVEL_BADARG; |
exitcode = (int)MANDOCLEVEL_BADARG; |
say(file, "Not a regular file"); |
say(file, "Not a regular file"); |
return; |
return; |
} else if (inocheck(&st)) { |
|
if (warnings) |
|
say(file, "Duplicate file"); |
|
return; |
|
} |
} |
start = buf + strlen(basedir); |
start = buf + strlen(basedir); |
sec = arch = name = dsec = NULL; |
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
dform = FORM_NONE; |
strlcpy(mlink->file, start, sizeof(mlink->file)); |
|
|
/* |
/* |
* First try to guess our directory structure. |
* First try to guess our directory structure. |
Line 720 filescan(const char *file) |
|
Line 720 filescan(const char *file) |
|
if (NULL != (p = strchr(start, '/'))) { |
if (NULL != (p = strchr(start, '/'))) { |
*p++ = '\0'; |
*p++ = '\0'; |
if (0 == strncmp(start, "man", 3)) { |
if (0 == strncmp(start, "man", 3)) { |
dform = FORM_SRC; |
mlink->dform = FORM_SRC; |
dsec = start + 3; |
mlink->dsec = mandoc_strdup(start + 3); |
} else if (0 == strncmp(start, "cat", 3)) { |
} else if (0 == strncmp(start, "cat", 3)) { |
dform = FORM_CAT; |
mlink->dform = FORM_CAT; |
dsec = start + 3; |
mlink->dsec = mandoc_strdup(start + 3); |
} |
} |
|
|
start = p; |
start = p; |
if (NULL != dsec && NULL != (p = strchr(start, '/'))) { |
if (NULL != mlink->dsec && NULL != (p = strchr(start, '/'))) { |
*p++ = '\0'; |
*p++ = '\0'; |
arch = start; |
mlink->arch = mandoc_strdup(start); |
start = p; |
start = p; |
} |
} |
} |
} |
|
|
/* |
/* |
Line 745 filescan(const char *file) |
|
Line 745 filescan(const char *file) |
|
|
|
if ('.' == *p) { |
if ('.' == *p) { |
*p++ = '\0'; |
*p++ = '\0'; |
sec = p; |
mlink->fsec = mandoc_strdup(p); |
} |
} |
|
|
/* |
/* |
* Now try to parse the name. |
* Now try to parse the name. |
* Use the filename portion of the path. |
* Use the filename portion of the path. |
*/ |
*/ |
name = start; |
mlink->name = start; |
if (NULL != (p = strrchr(start, '/'))) { |
if (NULL != (p = strrchr(start, '/'))) { |
name = p + 1; |
mlink->name = p + 1; |
*p = '\0'; |
*p = '\0'; |
} |
} |
|
mlink->name = mandoc_strdup(mlink->name); |
|
|
mlink_add(dform, file, name, dsec, sec, arch, &st); |
mlink_add(mlink, &st); |
} |
} |
|
|
static int |
|
inocheck(const struct stat *st) |
|
{ |
|
struct inodev inodev; |
|
uint32_t hash; |
|
|
|
memset(&inodev, 0, sizeof(inodev)); |
|
inodev.st_ino = hash = st->st_ino; |
|
inodev.st_dev = st->st_dev; |
|
|
|
return(NULL != ohash_find(&mpages, ohash_lookup_memory( |
|
&mpages, (char *)&inodev, sizeof(inodev), hash))); |
|
} |
|
|
|
static void |
static void |
mlink_add(int dform, const char *file, const char *name, const char *dsec, |
mlink_add(struct mlink *mlink, const struct stat *st) |
const char *sec, const char *arch, const struct stat *st) |
|
{ |
{ |
struct inodev inodev; |
struct inodev inodev; |
struct mpage *mpage; |
struct mpage *mpage; |
struct mlink *mlink; |
|
int sform; |
|
unsigned int slot; |
unsigned int slot; |
|
|
assert(NULL != file); |
assert(NULL != mlink->file); |
|
|
if (NULL == name) |
if (NULL == mlink->dsec) |
name = ""; |
mlink->dsec = mandoc_strdup(""); |
if (NULL == sec) |
if (NULL == mlink->arch) |
sec = ""; |
mlink->arch = mandoc_strdup(""); |
if (NULL == dsec) |
if (NULL == mlink->name) |
dsec = ""; |
mlink->name = mandoc_strdup(""); |
if (NULL == arch) |
if (NULL == mlink->fsec) |
arch = ""; |
mlink->fsec = mandoc_strdup(""); |
|
|
if ('0' == *sec) { |
if ('0' == *mlink->fsec) { |
sec = dsec; |
free(mlink->fsec); |
sform = FORM_CAT; |
mlink->fsec = mandoc_strdup(mlink->dsec); |
} else if ('1' <= *sec && '9' >= *sec) |
mlink->fform = FORM_CAT; |
sform = FORM_SRC; |
} else if ('1' <= *mlink->fsec && '9' >= *mlink->fsec) |
|
mlink->fform = FORM_SRC; |
else |
else |
sform = FORM_NONE; |
mlink->fform = 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); |
|
|
|
slot = ohash_qlookup(&mlinks, mlink->file); |
slot = ohash_qlookup(&mlinks, mlink->file); |
assert(NULL == ohash_find(&mlinks, slot)); |
assert(NULL == ohash_find(&mlinks, slot)); |
ohash_insert(&mlinks, slot, mlink); |
ohash_insert(&mlinks, slot, mlink); |
Line 828 mlink_add(int dform, const char *file, const char *nam |
|
Line 804 mlink_add(int dform, const char *file, const char *nam |
|
mpage->inodev.st_dev = inodev.st_dev; |
mpage->inodev.st_dev = inodev.st_dev; |
ohash_insert(&mpages, slot, mpage); |
ohash_insert(&mpages, slot, mpage); |
} else |
} else |
abort(); |
mlink->next = mpage->mlinks; |
mpage->mlinks = mlink; |
mpage->mlinks = mlink; |
} |
} |
|
|
Line 853 mpages_free(void) |
|
Line 829 mpages_free(void) |
|
mpage = ohash_first(&mpages, &slot); |
mpage = ohash_first(&mpages, &slot); |
while (NULL != mpage) { |
while (NULL != mpage) { |
while (NULL != (mlink = mpage->mlinks)) { |
while (NULL != (mlink = mpage->mlinks)) { |
mpage->mlinks = NULL; |
mpage->mlinks = mlink->next; |
mlink_free(mlink); |
mlink_free(mlink); |
} |
} |
free(mpage->sec); |
free(mpage->sec); |
Line 948 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 924 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
* formatted. Fall back to formatted mode. |
* formatted. Fall back to formatted mode. |
*/ |
*/ |
if (FORM_CAT != mpage->mlinks->dform || |
if (FORM_CAT != mpage->mlinks->dform || |
FORM_CAT != mpage->mlinks->sform) { |
FORM_CAT != mpage->mlinks->fform) { |
lvl = mparse_readfd(mp, -1, mpage->mlinks->file); |
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); |
Line 959 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 935 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
mpage->sec = |
mpage->sec = |
mandoc_strdup(mdoc_meta(mdoc)->msec); |
mandoc_strdup(mdoc_meta(mdoc)->msec); |
mpage->arch = mdoc_meta(mdoc)->arch; |
mpage->arch = mdoc_meta(mdoc)->arch; |
if (NULL == mpage->arch) |
mpage->arch = mandoc_strdup( |
mpage->arch = ""; |
NULL == mpage->arch ? "" : mpage->arch); |
mpage->arch = mandoc_strdup(mpage->arch); |
|
mpage->title = |
mpage->title = |
mandoc_strdup(mdoc_meta(mdoc)->title); |
mandoc_strdup(mdoc_meta(mdoc)->title); |
} else if (NULL != man) { |
} else if (NULL != man) { |
Line 1789 utf8key(struct mchars *mc, struct str *key) |
|
Line 1764 utf8key(struct mchars *mc, struct str *key) |
|
static void |
static void |
dbindex(const struct mpage *mpage, struct mchars *mc) |
dbindex(const struct mpage *mpage, struct mchars *mc) |
{ |
{ |
|
struct mlink *mlink; |
struct str *key; |
struct str *key; |
const char *desc; |
const char *desc; |
int64_t recno; |
int64_t recno; |
Line 1828 dbindex(const struct mpage *mpage, struct mchars *mc) |
|
Line 1804 dbindex(const struct mpage *mpage, struct mchars *mc) |
|
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; |
for (mlink = mpage->mlinks; mlink; mlink = mlink->next) { |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->dsec); |
i = 1; |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->arch); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->file); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->file); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec); |
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, recno); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch); |
SQL_STEP(stmts[STMT_INSERT_LINK]); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name); |
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, recno); |
|
SQL_STEP(stmts[STMT_INSERT_LINK]); |
|
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
|
} |
|
|
for (key = ohash_first(&strings, &slot); NULL != key; |
for (key = ohash_first(&strings, &slot); NULL != key; |
key = ohash_next(&strings, &slot)) { |
key = ohash_next(&strings, &slot)) { |
Line 1970 dbopen(int real) |
|
Line 1949 dbopen(int real) |
|
");\n" |
");\n" |
"\n" |
"\n" |
"CREATE TABLE \"mlinks\" (\n" |
"CREATE TABLE \"mlinks\" (\n" |
|
" \"file\" TEXT NOT NULL,\n" |
" \"sec\" TEXT NOT NULL,\n" |
" \"sec\" TEXT NOT NULL,\n" |
" \"arch\" TEXT NOT NULL,\n" |
" \"arch\" TEXT NOT NULL,\n" |
" \"name\" TEXT NOT NULL,\n" |
" \"name\" TEXT NOT NULL,\n" |
Line 2002 prepare_statements: |
|
Line 1982 prepare_statements: |
|
"(file,sec,arch,desc,form) VALUES (?,?,?,?,?)"; |
"(file,sec,arch,desc,form) VALUES (?,?,?,?,?)"; |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL); |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL); |
sql = "INSERT INTO mlinks " |
sql = "INSERT INTO mlinks " |
"(sec,arch,name,pageid) VALUES (?,?,?,?)"; |
"(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)"; |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL); |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL); |
sql = "INSERT INTO keys " |
sql = "INSERT INTO keys " |
"(bits,key,pageid) VALUES (?,?,?)"; |
"(bits,key,pageid) VALUES (?,?,?)"; |