version 1.294, 2017/07/01 09:47:30 |
version 1.298, 2017/07/02 21:18:29 |
Line 92 static int fs_lookup(const struct manpaths *, |
|
Line 92 static int fs_lookup(const struct manpaths *, |
|
size_t ipath, const char *, |
size_t ipath, const char *, |
const char *, const char *, |
const char *, const char *, |
struct manpage **, size_t *); |
struct manpage **, size_t *); |
static void fs_search(const struct mansearch *, |
static int fs_search(const struct mansearch *, |
const struct manpaths *, int, char**, |
const struct manpaths *, int, char**, |
struct manpage **, size_t *); |
struct manpage **, size_t *); |
static int koptions(int *, char *); |
static int koptions(int *, char *); |
Line 663 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 663 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
if (globres == 0) |
if (globres == 0) |
file = mandoc_strdup(*globinfo.gl_pathv); |
file = mandoc_strdup(*globinfo.gl_pathv); |
globfree(&globinfo); |
globfree(&globinfo); |
if (globres != 0) |
if (globres == 0) |
|
goto found; |
|
if (res != NULL || ipath + 1 != paths->sz) |
return 0; |
return 0; |
|
|
|
mandoc_asprintf(&file, "%s.%s", name, sec); |
|
globres = access(file, R_OK); |
|
free(file); |
|
return globres != -1; |
|
|
found: |
found: |
warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s", |
warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s", |
name, sec, BINM_MAKEWHATIS, paths->paths[ipath]); |
name, sec, BINM_MAKEWHATIS, paths->paths[ipath]); |
|
if (res == NULL) { |
|
free(file); |
|
return 1; |
|
} |
*res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage)); |
*res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage)); |
page = *res + (*ressz - 1); |
page = *res + (*ressz - 1); |
page->file = file; |
page->file = file; |
|
|
return 1; |
return 1; |
} |
} |
|
|
static void |
static int |
fs_search(const struct mansearch *cfg, const struct manpaths *paths, |
fs_search(const struct mansearch *cfg, const struct manpaths *paths, |
int argc, char **argv, struct manpage **res, size_t *ressz) |
int argc, char **argv, struct manpage **res, size_t *ressz) |
{ |
{ |
Line 693 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 704 fs_search(const struct mansearch *cfg, const struct ma |
|
|
|
assert(cfg->argmode == ARG_NAME); |
assert(cfg->argmode == ARG_NAME); |
|
|
*res = NULL; |
if (res != NULL) |
|
*res = NULL; |
*ressz = lastsz = 0; |
*ressz = lastsz = 0; |
while (argc) { |
while (argc) { |
for (ipath = 0; ipath < paths->sz; ipath++) { |
for (ipath = 0; ipath < paths->sz; ipath++) { |
Line 701 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 713 fs_search(const struct mansearch *cfg, const struct ma |
|
if (fs_lookup(paths, ipath, cfg->sec, |
if (fs_lookup(paths, ipath, cfg->sec, |
cfg->arch, *argv, res, ressz) && |
cfg->arch, *argv, res, ressz) && |
cfg->firstmatch) |
cfg->firstmatch) |
return; |
return 1; |
} else for (isec = 0; isec < nsec; isec++) |
} else for (isec = 0; isec < nsec; isec++) |
if (fs_lookup(paths, ipath, sections[isec], |
if (fs_lookup(paths, ipath, sections[isec], |
cfg->arch, *argv, res, ressz) && |
cfg->arch, *argv, res, ressz) && |
cfg->firstmatch) |
cfg->firstmatch) |
return; |
return 1; |
} |
} |
if (*ressz == lastsz) |
if (res != NULL && *ressz == lastsz) |
warnx("No entry for %s in the manual.", *argv); |
warnx("No entry for %s in the manual.", *argv); |
lastsz = *ressz; |
lastsz = *ressz; |
argv++; |
argv++; |
argc--; |
argc--; |
} |
} |
|
return 0; |
} |
} |
|
|
static void |
static void |
Line 750 parse(struct curparse *curp, int fd, const char *file) |
|
Line 763 parse(struct curparse *curp, int fd, const char *file) |
|
|
|
if (man == NULL) |
if (man == NULL) |
return; |
return; |
if (curp->mmin < MANDOCERR_STYLE) |
mandoc_xr_reset(); |
mandoc_xr_reset(); |
|
if (man->macroset == MACROSET_MDOC) { |
if (man->macroset == MACROSET_MDOC) { |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
mdoc_validate(man); |
mdoc_validate(man); |
Line 803 parse(struct curparse *curp, int fd, const char *file) |
|
Line 815 parse(struct curparse *curp, int fd, const char *file) |
|
break; |
break; |
} |
} |
} |
} |
check_xr(file); |
if (curp->mmin < MANDOCERR_STYLE) |
|
check_xr(file); |
mparse_updaterc(curp->mp, &rc); |
mparse_updaterc(curp->mp, &rc); |
} |
} |
|
|
Line 820 check_xr(const char *file) |
|
Line 833 check_xr(const char *file) |
|
manpath_base(&paths); |
manpath_base(&paths); |
|
|
for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) { |
for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) { |
|
if (xr->line == -1) |
|
continue; |
search.arch = NULL; |
search.arch = NULL; |
search.sec = xr->sec; |
search.sec = xr->sec; |
search.outkey = NULL; |
search.outkey = NULL; |
Line 827 check_xr(const char *file) |
|
Line 842 check_xr(const char *file) |
|
search.firstmatch = 1; |
search.firstmatch = 1; |
if (mansearch(&search, &paths, 1, &xr->name, NULL, &sz)) |
if (mansearch(&search, &paths, 1, &xr->name, NULL, &sz)) |
continue; |
continue; |
mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec); |
if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz)) |
|
continue; |
|
if (xr->count == 1) |
|
mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec); |
|
else |
|
mandoc_asprintf(&cp, "Xr %s %s (%d times)", |
|
xr->name, xr->sec, xr->count); |
mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE, |
mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE, |
file, xr->line, xr->pos + 1, cp); |
file, xr->line, xr->pos + 1, cp); |
free(cp); |
free(cp); |