version 1.221, 2015/02/16 16:23:54 |
version 1.223, 2015/03/06 09:24:59 |
|
|
#include <ctype.h> |
#include <ctype.h> |
#include <errno.h> |
#include <errno.h> |
#include <fcntl.h> |
#include <fcntl.h> |
|
#include <glob.h> |
#include <stdio.h> |
#include <stdio.h> |
#include <stdint.h> |
#include <stdint.h> |
#include <stdlib.h> |
#include <stdlib.h> |
Line 302 main(int argc, char *argv[]) |
|
Line 303 main(int argc, char *argv[]) |
|
argc = 1; |
argc = 1; |
} |
} |
} else if (argc > 1 && |
} else if (argc > 1 && |
((uc = argv[0]) != NULL) && |
((uc = (unsigned char *)argv[0]) != NULL) && |
((isdigit(uc[0]) && (uc[1] == '\0' || |
((isdigit(uc[0]) && (uc[1] == '\0' || |
(isalpha(uc[1]) && uc[2] == '\0'))) || |
(isalpha(uc[1]) && uc[2] == '\0'))) || |
(uc[0] == 'n' && uc[1] == '\0'))) { |
(uc[0] == 'n' && uc[1] == '\0'))) { |
search.sec = uc; |
search.sec = (char *)uc; |
argv++; |
argv++; |
argc--; |
argc--; |
} |
} |
if (search.arch == NULL) |
if (search.arch == NULL) |
search.arch = getenv("MACHINE"); |
search.arch = getenv("MACHINE"); |
|
#ifdef MACHINE |
if (search.arch == NULL) |
if (search.arch == NULL) |
search.arch = MACHINE; |
search.arch = MACHINE; |
|
#endif |
} |
} |
|
|
rc = MANDOCLEVEL_OK; |
rc = MANDOCLEVEL_OK; |
Line 517 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 520 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
const char *sec, const char *arch, const char *name, |
const char *sec, const char *arch, const char *name, |
struct manpage **res, size_t *ressz) |
struct manpage **res, size_t *ressz) |
{ |
{ |
|
glob_t globinfo; |
struct manpage *page; |
struct manpage *page; |
char *file; |
char *file; |
int form; |
int form, globres; |
|
|
|
form = FORM_SRC; |
mandoc_asprintf(&file, "%s/man%s/%s.%s", |
mandoc_asprintf(&file, "%s/man%s/%s.%s", |
paths->paths[ipath], sec, name, sec); |
paths->paths[ipath], sec, name, sec); |
if (access(file, R_OK) != -1) { |
if (access(file, R_OK) != -1) |
form = FORM_SRC; |
|
goto found; |
goto found; |
} |
|
free(file); |
free(file); |
|
|
mandoc_asprintf(&file, "%s/cat%s/%s.0", |
mandoc_asprintf(&file, "%s/cat%s/%s.0", |
Line 540 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 543 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
if (arch != NULL) { |
if (arch != NULL) { |
mandoc_asprintf(&file, "%s/man%s/%s/%s.%s", |
mandoc_asprintf(&file, "%s/man%s/%s/%s.%s", |
paths->paths[ipath], sec, arch, name, sec); |
paths->paths[ipath], sec, arch, name, sec); |
if (access(file, R_OK) != -1) { |
if (access(file, R_OK) != -1) |
form = FORM_SRC; |
|
goto found; |
goto found; |
} |
|
free(file); |
free(file); |
} |
} |
return(0); |
|
|
mandoc_asprintf(&file, "%s/man%s/%s.*", |
|
paths->paths[ipath], sec, name); |
|
globres = glob(file, 0, NULL, &globinfo); |
|
if (globres != 0 && globres != GLOB_NOMATCH) |
|
fprintf(stderr, "%s: %s: glob: %s\n", |
|
progname, file, strerror(errno)); |
|
free(file); |
|
if (globres == 0) |
|
file = mandoc_strdup(*globinfo.gl_pathv); |
|
globfree(&globinfo); |
|
if (globres != 0) |
|
return(0); |
|
|
found: |
found: |
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |