version 1.83, 2013/12/27 14:29:28 |
version 1.84, 2013/12/27 15:39:03 |
|
|
}; |
}; |
|
|
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) */ |
Line 142 static void *hash_alloc(size_t, void *); |
|
Line 142 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 int inocheck(const struct stat *); |
static void mlink_add(int, const char *, const char *, const char *, |
static void mlink_add(struct mlink *, const struct stat *); |
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, "Duplicate file"); |
say(path, "Duplicate file"); |
continue; |
continue; |
} else if (NULL == (sec = |
} else if (NULL == (fsec = |
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 708 filescan(const char *file) |
|
Line 716 filescan(const char *file) |
|
return; |
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 728 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 753 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 |
static int |
Line 776 inocheck(const struct stat *st) |
|
Line 785 inocheck(const struct stat *st) |
|
} |
} |
|
|
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 948 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 946 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 957 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) { |