version 1.138, 2014/04/18 21:55:38 |
version 1.143, 2014/04/23 19:09:16 |
Line 180 static char tempfilename[32]; |
|
Line 180 static char tempfilename[32]; |
|
static char *progname; |
static char *progname; |
static int nodb; /* no database changes */ |
static int nodb; /* no database changes */ |
static int mparse_options; /* abort the parse early */ |
static int mparse_options; /* abort the parse early */ |
static int use_all; /* use all found files */ |
static int use_all; /* use all found files */ |
static int debug; /* print what we're doing */ |
static int debug; /* print what we're doing */ |
static int warnings; /* warn about crap */ |
static int warnings; /* warn about crap */ |
static int write_utf8; /* write UTF-8 output; else ASCII */ |
static int write_utf8; /* write UTF-8 output; else ASCII */ |
static int exitcode; /* to be returned by main */ |
static int exitcode; /* to be returned by main */ |
static enum op op; /* operational mode */ |
static enum op op; /* operational mode */ |
static char basedir[PATH_MAX]; /* current base directory */ |
static char basedir[PATH_MAX]; /* current base directory */ |
static struct ohash mpages; /* table of distinct manual pages */ |
static struct ohash mpages; /* table of distinct manual pages */ |
static struct ohash mlinks; /* table of directory entries */ |
static struct ohash mlinks; /* table of directory entries */ |
Line 320 static const struct mdoc_handler mdocs[MDOC_MAX] = { |
|
Line 320 static const struct mdoc_handler mdocs[MDOC_MAX] = { |
|
{ NULL, 0 }, /* Ta */ |
{ NULL, 0 }, /* Ta */ |
}; |
}; |
|
|
|
|
int |
int |
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
{ |
{ |
Line 348 main(int argc, char *argv[]) |
|
Line 349 main(int argc, char *argv[]) |
|
++progname; |
++progname; |
|
|
/* |
/* |
* We accept a few different invocations. |
* We accept a few different invocations. |
* The CHECKOP macro makes sure that invocation styles don't |
* The CHECKOP macro makes sure that invocation styles don't |
* clobber each other. |
* clobber each other. |
*/ |
*/ |
Line 363 main(int argc, char *argv[]) |
|
Line 364 main(int argc, char *argv[]) |
|
|
|
while (-1 != (ch = getopt(argc, argv, "aC:Dd:npQT:tu:v"))) |
while (-1 != (ch = getopt(argc, argv, "aC:Dd:npQT:tu:v"))) |
switch (ch) { |
switch (ch) { |
case ('a'): |
case 'a': |
use_all = 1; |
use_all = 1; |
break; |
break; |
case ('C'): |
case 'C': |
CHECKOP(op, ch); |
CHECKOP(op, ch); |
path_arg = optarg; |
path_arg = optarg; |
op = OP_CONFFILE; |
op = OP_CONFFILE; |
break; |
break; |
case ('D'): |
case 'D': |
debug++; |
debug++; |
break; |
break; |
case ('d'): |
case 'd': |
CHECKOP(op, ch); |
CHECKOP(op, ch); |
path_arg = optarg; |
path_arg = optarg; |
op = OP_UPDATE; |
op = OP_UPDATE; |
break; |
break; |
case ('n'): |
case 'n': |
nodb = 1; |
nodb = 1; |
break; |
break; |
case ('p'): |
case 'p': |
warnings = 1; |
warnings = 1; |
break; |
break; |
case ('Q'): |
case 'Q': |
mparse_options |= MPARSE_QUICK; |
mparse_options |= MPARSE_QUICK; |
break; |
break; |
case ('T'): |
case 'T': |
if (strcmp(optarg, "utf8")) { |
if (strcmp(optarg, "utf8")) { |
fprintf(stderr, "-T%s: Unsupported " |
fprintf(stderr, "-T%s: Unsupported " |
"output format\n", optarg); |
"output format\n", optarg); |
Line 396 main(int argc, char *argv[]) |
|
Line 397 main(int argc, char *argv[]) |
|
} |
} |
write_utf8 = 1; |
write_utf8 = 1; |
break; |
break; |
case ('t'): |
case 't': |
CHECKOP(op, ch); |
CHECKOP(op, ch); |
dup2(STDOUT_FILENO, STDERR_FILENO); |
dup2(STDOUT_FILENO, STDERR_FILENO); |
op = OP_TEST; |
op = OP_TEST; |
nodb = warnings = 1; |
nodb = warnings = 1; |
break; |
break; |
case ('u'): |
case 'u': |
CHECKOP(op, ch); |
CHECKOP(op, ch); |
path_arg = optarg; |
path_arg = optarg; |
op = OP_DELETE; |
op = OP_DELETE; |
break; |
break; |
case ('v'): |
case 'v': |
/* Compatibility with espie@'s makewhatis. */ |
/* Compatibility with espie@'s makewhatis. */ |
break; |
break; |
default: |
default: |
Line 430 main(int argc, char *argv[]) |
|
Line 431 main(int argc, char *argv[]) |
|
ohash_init(&mlinks, 6, &mlinks_info); |
ohash_init(&mlinks, 6, &mlinks_info); |
|
|
if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) { |
if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) { |
/* |
|
* Force processing all files. |
|
*/ |
|
use_all = 1; |
|
|
|
/* |
/* |
* All of these deal with a specific directory. |
* All of these deal with a specific directory. |
* Jump into that directory then collect files specified |
* Jump into that directory first. |
* on the command-line. |
|
*/ |
*/ |
if (0 == set_basedir(path_arg)) |
if (0 == set_basedir(path_arg)) |
goto out; |
goto out; |
|
|
if (dbopen(1)) { |
if (dbopen(1)) { |
|
/* |
|
* The existing database is usable. Process |
|
* all files specified on the command-line. |
|
*/ |
|
use_all = 1; |
for (i = 0; i < argc; i++) |
for (i = 0; i < argc; i++) |
filescan(argv[i]); |
filescan(argv[i]); |
if (OP_TEST != op) |
if (OP_TEST != op) |
Line 452 main(int argc, char *argv[]) |
|
Line 454 main(int argc, char *argv[]) |
|
* Database missing or corrupt. |
* Database missing or corrupt. |
* Recreate from scratch. |
* Recreate from scratch. |
*/ |
*/ |
|
exitcode = (int)MANDOCLEVEL_OK; |
op = OP_DEFAULT; |
op = OP_DEFAULT; |
if (0 == treescan()) |
if (0 == treescan()) |
goto out; |
goto out; |
Line 468 main(int argc, char *argv[]) |
|
Line 471 main(int argc, char *argv[]) |
|
* manpath_parse() wants to do it. |
* manpath_parse() wants to do it. |
*/ |
*/ |
if (argc > 0) { |
if (argc > 0) { |
dirs.paths = mandoc_calloc |
dirs.paths = mandoc_calloc(argc, |
(argc, sizeof(char *)); |
sizeof(char *)); |
dirs.sz = (size_t)argc; |
dirs.sz = (size_t)argc; |
for (i = 0; i < argc; i++) |
for (i = 0; i < argc; i++) |
dirs.paths[i] = mandoc_strdup(argv[i]); |
dirs.paths[i] = mandoc_strdup(argv[i]); |
|
|
" %s [-DnpQ] [-Tutf8] -d dir [file ...]\n" |
" %s [-DnpQ] [-Tutf8] -d dir [file ...]\n" |
" %s [-Dnp] -u dir [file ...]\n" |
" %s [-Dnp] -u dir [file ...]\n" |
" %s [-Q] -t file ...\n", |
" %s [-Q] -t file ...\n", |
progname, progname, progname, |
progname, progname, progname, |
progname, progname); |
progname, progname); |
|
|
return((int)MANDOCLEVEL_BADARG); |
return((int)MANDOCLEVEL_BADARG); |
|
|
* If use_all has been specified, grok all files. |
* If use_all has been specified, grok all files. |
* If not, sanitise paths to the following: |
* If not, sanitise paths to the following: |
* |
* |
* [./]man*[/<arch>]/<name>.<section> |
* [./]man*[/<arch>]/<name>.<section> |
* or |
* or |
* [./]cat<section>[/<arch>]/<name>.0 |
* [./]cat<section>[/<arch>]/<name>.0 |
* |
* |
|
|
static int |
static int |
treescan(void) |
treescan(void) |
{ |
{ |
|
char buf[PATH_MAX]; |
FTS *f; |
FTS *f; |
FTSENT *ff; |
FTSENT *ff; |
struct mlink *mlink; |
struct mlink *mlink; |
|
|
argv[0] = "."; |
argv[0] = "."; |
argv[1] = (char *)NULL; |
argv[1] = (char *)NULL; |
|
|
/* |
f = fts_open((char * const *)argv, |
* Walk through all components under the directory, using the |
FTS_PHYSICAL | FTS_NOCHDIR, NULL); |
* logical descent of files. |
|
*/ |
|
f = fts_open((char * const *)argv, FTS_LOGICAL, NULL); |
|
if (NULL == f) { |
if (NULL == f) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "&fts_open"); |
say("", "&fts_open"); |
|
|
|
|
while (NULL != (ff = fts_read(f))) { |
while (NULL != (ff = fts_read(f))) { |
path = ff->fts_path + 2; |
path = ff->fts_path + 2; |
|
switch (ff->fts_info) { |
|
|
/* |
/* |
|
* Symbolic links require various sanity checks, |
|
* then get handled just like regular files. |
|
*/ |
|
case FTS_SL: |
|
if (NULL == realpath(path, buf)) { |
|
if (warnings) |
|
say(path, "&realpath"); |
|
continue; |
|
} |
|
if (strstr(buf, basedir) != buf) { |
|
if (warnings) say("", |
|
"%s: outside base directory", buf); |
|
continue; |
|
} |
|
/* Use logical inode to avoid mpages dupe. */ |
|
if (-1 == stat(path, ff->fts_statp)) { |
|
if (warnings) |
|
say(path, "&stat"); |
|
continue; |
|
} |
|
/* FALLTHROUGH */ |
|
|
|
/* |
* If we're a regular file, add an mlink by using the |
* If we're a regular file, add an mlink by using the |
* stored directory data and handling the filename. |
* stored directory data and handling the filename. |
*/ |
*/ |
if (FTS_F == ff->fts_info) { |
case FTS_F: |
if (0 == strcmp(path, MANDOC_DB)) |
if (0 == strcmp(path, MANDOC_DB)) |
continue; |
continue; |
if ( ! use_all && ff->fts_level < 2) { |
if ( ! use_all && ff->fts_level < 2) { |
|
|
fsec[-1] = '\0'; |
fsec[-1] = '\0'; |
|
|
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
strlcpy(mlink->file, path, sizeof(mlink->file)); |
if (strlcpy(mlink->file, path, |
|
sizeof(mlink->file)) >= |
|
sizeof(mlink->file)) { |
|
say(path, "Filename too long"); |
|
free(mlink); |
|
continue; |
|
} |
mlink->dform = dform; |
mlink->dform = dform; |
mlink->dsec = dsec; |
mlink->dsec = dsec; |
mlink->arch = arch; |
mlink->arch = arch; |
|
|
mlink->gzip = gzip; |
mlink->gzip = gzip; |
mlink_add(mlink, ff->fts_statp); |
mlink_add(mlink, ff->fts_statp); |
continue; |
continue; |
} else if (FTS_D != ff->fts_info && |
|
FTS_DP != ff->fts_info) { |
case FTS_D: |
|
/* FALLTHROUGH */ |
|
case FTS_DP: |
|
break; |
|
|
|
default: |
if (warnings) |
if (warnings) |
say(path, "Not a regular file"); |
say(path, "Not a regular file"); |
continue; |
continue; |
} |
} |
|
|
switch (ff->fts_level) { |
switch (ff->fts_level) { |
case (0): |
case 0: |
/* Ignore the root directory. */ |
/* Ignore the root directory. */ |
break; |
break; |
case (1): |
case 1: |
/* |
/* |
* This might contain manX/ or catX/. |
* This might contain manX/ or catX/. |
* Try to infer this from the name. |
* Try to infer this from the name. |
|
|
dsec = NULL; |
dsec = NULL; |
} |
} |
|
|
if (NULL != dsec || use_all) |
if (NULL != dsec || use_all) |
break; |
break; |
|
|
if (warnings) |
if (warnings) |
say(path, "Unknown directory part"); |
say(path, "Unknown directory part"); |
fts_set(f, ff, FTS_SKIP); |
fts_set(f, ff, FTS_SKIP); |
break; |
break; |
case (2): |
case 2: |
/* |
/* |
* Possibly our architecture. |
* Possibly our architecture. |
* If we're descending, keep tabs on it. |
* If we're descending, keep tabs on it. |
|
|
* Try to infer the manual section, architecture, and page name from the |
* Try to infer the manual section, architecture, and page name from the |
* path, assuming it looks like |
* path, assuming it looks like |
* |
* |
* [./]man*[/<arch>]/<name>.<section> |
* [./]man*[/<arch>]/<name>.<section> |
* or |
* or |
* [./]cat<section>[/<arch>]/<name>.0 |
* [./]cat<section>[/<arch>]/<name>.0 |
* |
* |
Line 736 filescan(const char *file) |
|
Line 773 filescan(const char *file) |
|
if (0 == strncmp(file, "./", 2)) |
if (0 == strncmp(file, "./", 2)) |
file += 2; |
file += 2; |
|
|
|
/* |
|
* We have to do lstat(2) before realpath(3) loses |
|
* the information whether this is a symbolic link. |
|
* We need to know that because for symbolic links, |
|
* we want to use the orginal file name, while for |
|
* regular files, we want to use the real path. |
|
*/ |
|
if (-1 == lstat(file, &st)) { |
|
exitcode = (int)MANDOCLEVEL_BADARG; |
|
say(file, "&lstat"); |
|
return; |
|
} else if (0 == ((S_IFREG | S_IFLNK) & st.st_mode)) { |
|
exitcode = (int)MANDOCLEVEL_BADARG; |
|
say(file, "Not a regular file"); |
|
return; |
|
} |
|
|
|
/* |
|
* We have to resolve the file name to the real path |
|
* in any case for the base directory check. |
|
*/ |
if (NULL == realpath(file, buf)) { |
if (NULL == realpath(file, buf)) { |
exitcode = (int)MANDOCLEVEL_BADARG; |
exitcode = (int)MANDOCLEVEL_BADARG; |
say(file, "&realpath"); |
say(file, "&realpath"); |
Line 752 filescan(const char *file) |
|
Line 810 filescan(const char *file) |
|
return; |
return; |
} |
} |
|
|
if (-1 == stat(buf, &st)) { |
/* |
exitcode = (int)MANDOCLEVEL_BADARG; |
* Now we are sure the file is inside our tree. |
say(file, "&stat"); |
* If it is a symbolic link, ignore the real path |
return; |
* and use the original name. |
} else if ( ! (S_IFREG & st.st_mode)) { |
* This implies passing stuff like "cat1/../man1/foo.1" |
exitcode = (int)MANDOCLEVEL_BADARG; |
* on the command line won't work. So don't do that. |
say(file, "Not a regular file"); |
* Note the stat(2) can still fail if the link target |
return; |
* doesn't exist. |
|
*/ |
|
if (S_IFLNK & st.st_mode) { |
|
if (-1 == stat(buf, &st)) { |
|
exitcode = (int)MANDOCLEVEL_BADARG; |
|
say(file, "&stat"); |
|
return; |
|
} |
|
if (strlcpy(buf, file, sizeof(buf)) >= sizeof(buf)) { |
|
say(file, "Filename too long"); |
|
return; |
|
} |
|
start = strstr(buf, basedir) == buf ? |
|
buf + strlen(basedir) + 1 : buf; |
} |
} |
|
|
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
strlcpy(mlink->file, start, sizeof(mlink->file)); |
if (strlcpy(mlink->file, start, sizeof(mlink->file)) >= |
|
sizeof(mlink->file)) { |
|
say(start, "Filename too long"); |
|
return; |
|
} |
|
|
/* |
/* |
* First try to guess our directory structure. |
* First try to guess our directory structure. |
Line 911 mlinks_undupe(struct mpage *mpage) |
|
Line 986 mlinks_undupe(struct mpage *mpage) |
|
mpage->form = FORM_NONE; |
mpage->form = FORM_NONE; |
goto nextlink; |
goto nextlink; |
} |
} |
if (strlcpy(buf, mlink->file, PATH_MAX) >= PATH_MAX) { |
(void)strlcpy(buf, mlink->file, sizeof(buf)); |
if (warnings) |
|
say(mlink->file, "Filename too long"); |
|
goto nextlink; |
|
} |
|
bufp = strstr(buf, "cat"); |
bufp = strstr(buf, "cat"); |
assert(NULL != bufp); |
assert(NULL != bufp); |
memcpy(bufp, "man", 3); |
memcpy(bufp, "man", 3); |
if (NULL != (bufp = strrchr(buf, '.'))) |
if (NULL != (bufp = strrchr(buf, '.'))) |
*++bufp = '\0'; |
*++bufp = '\0'; |
strlcat(buf, mlink->dsec, PATH_MAX); |
(void)strlcat(buf, mlink->dsec, sizeof(buf)); |
if (NULL == ohash_find(&mlinks, |
if (NULL == ohash_find(&mlinks, |
ohash_qlookup(&mlinks, buf))) |
ohash_qlookup(&mlinks, buf))) |
goto nextlink; |
goto nextlink; |
if (warnings) |
if (warnings) |
say(mlink->file, "Man source exists: %s", buf); |
say(mlink->file, "Man source exists: %s", buf); |
Line 1052 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1123 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
goto nextpage; |
goto nextpage; |
} |
} |
switch (child_pid = fork()) { |
switch (child_pid = fork()) { |
case (-1): |
case -1: |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say(mpage->mlinks->file, "&fork gunzip"); |
say(mpage->mlinks->file, "&fork gunzip"); |
child_pid = 0; |
child_pid = 0; |
close(fd[1]); |
close(fd[1]); |
close(fd[0]); |
close(fd[0]); |
goto nextpage; |
goto nextpage; |
case (0): |
case 0: |
close(fd[0]); |
close(fd[0]); |
if (-1 == dup2(fd[1], STDOUT_FILENO)) { |
if (-1 == dup2(fd[1], STDOUT_FILENO)) { |
say(mpage->mlinks->file, |
say(mpage->mlinks->file, |
Line 1225 names_check(void) |
|
Line 1296 names_check(void) |
|
"AND mlinks.name == names.name" |
"AND mlinks.name == names.name" |
")" |
")" |
") JOIN (" |
") JOIN (" |
"SELECT * FROM mlinks GROUP BY pageid" |
"SELECT sec, arch, name, pageid FROM mlinks " |
|
"GROUP BY pageid" |
") USING (pageid);", |
") USING (pageid);", |
-1, &stmt, NULL); |
-1, &stmt, NULL); |
|
|
Line 1274 parse_cat(struct mpage *mpage, int fd) |
|
Line 1346 parse_cat(struct mpage *mpage, int fd) |
|
while (NULL != (line = fgetln(stream, &len))) |
while (NULL != (line = fgetln(stream, &len))) |
if ('\n' != *line && ' ' != *line) |
if ('\n' != *line && ' ' != *line) |
break; |
break; |
|
|
/* |
/* |
* Read up until the next section into a buffer. |
* Read up until the next section into a buffer. |
* Strip the leading and trailing newline from each read line, |
* Strip the leading and trailing newline from each read line, |
Line 1344 parse_cat(struct mpage *mpage, int fd) |
|
Line 1416 parse_cat(struct mpage *mpage, int fd) |
|
if (0 == len) { |
if (0 == len) { |
memmove(line, line + 1, plen--); |
memmove(line, line + 1, plen--); |
continue; |
continue; |
} |
} |
memmove(line - 1, line + 1, plen - len); |
memmove(line - 1, line + 1, plen - len); |
plen -= 2; |
plen -= 2; |
} |
} |
Line 1408 parse_man(struct mpage *mpage, const struct man_node * |
|
Line 1480 parse_man(struct mpage *mpage, const struct man_node * |
|
body = n; |
body = n; |
assert(body->parent); |
assert(body->parent); |
if (NULL != (head = body->parent->head) && |
if (NULL != (head = body->parent->head) && |
1 == head->nchild && |
1 == head->nchild && |
NULL != (head = (head->child)) && |
NULL != (head = (head->child)) && |
MAN_TEXT == head->type && |
MAN_TEXT == head->type && |
0 == strcmp(head->string, "NAME") && |
0 == strcmp(head->string, "NAME") && |
NULL != body->child) { |
NULL != body->child) { |
|
|
/* |
/* |
* Suck the entire NAME section into memory. |
* Suck the entire NAME section into memory. |
Line 1426 parse_man(struct mpage *mpage, const struct man_node * |
|
Line 1498 parse_man(struct mpage *mpage, const struct man_node * |
|
if (NULL == title) |
if (NULL == title) |
return; |
return; |
|
|
/* |
/* |
* Go through a special heuristic dance here. |
* Go through a special heuristic dance here. |
* Conventionally, one or more manual names are |
* Conventionally, one or more manual names are |
* comma-specified prior to a whitespace, then a |
* comma-specified prior to a whitespace, then a |
Line 1508 parse_mdoc(struct mpage *mpage, const struct mdoc_node |
|
Line 1580 parse_mdoc(struct mpage *mpage, const struct mdoc_node |
|
assert(NULL != n); |
assert(NULL != n); |
for (n = n->child; NULL != n; n = n->next) { |
for (n = n->child; NULL != n; n = n->next) { |
switch (n->type) { |
switch (n->type) { |
case (MDOC_ELEM): |
case MDOC_ELEM: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_BLOCK): |
case MDOC_BLOCK: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_HEAD): |
case MDOC_HEAD: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_BODY): |
case MDOC_BODY: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_TAIL): |
case MDOC_TAIL: |
if (NULL != mdocs[n->tok].fp) |
if (NULL != mdocs[n->tok].fp) |
if (0 == (*mdocs[n->tok].fp)(mpage, n)) |
if (0 == (*mdocs[n->tok].fp)(mpage, n)) |
break; |
break; |
Line 1540 parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_n |
|
Line 1612 parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_n |
|
size_t sz; |
size_t sz; |
|
|
if (SEC_SYNOPSIS != n->sec || |
if (SEC_SYNOPSIS != n->sec || |
NULL == (n = n->child) || |
NULL == (n = n->child) || |
MDOC_TEXT != n->type) |
MDOC_TEXT != n->type) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 1584 parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_n |
|
Line 1656 parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_n |
|
if (NULL == (n = n->child) || MDOC_TEXT != n->type) |
if (NULL == (n = n->child) || MDOC_TEXT != n->type) |
return(0); |
return(0); |
|
|
/* |
/* |
* Parse: .Fn "struct type *name" "char *arg". |
* Parse: .Fn "struct type *name" "char *arg". |
* First strip away pointer symbol. |
* First strip away pointer symbol. |
* Then store the function name, then type. |
* Then store the function name, then type. |
* Finally, store the arguments. |
* Finally, store the arguments. |
*/ |
*/ |
|
|
if (NULL == (cp = strrchr(n->string, ' '))) |
if (NULL == (cp = strrchr(n->string, ' '))) |
Line 1805 render_key(struct mchars *mc, struct str *key) |
|
Line 1877 render_key(struct mchars *mc, struct str *key) |
|
if (strcspn(val, res) == bsz) { |
if (strcspn(val, res) == bsz) { |
key->rendered = key->key; |
key->rendered = key->key; |
return; |
return; |
} |
} |
|
|
/* Pre-allocate by the length of the input */ |
/* Pre-allocate by the length of the input */ |
|
|
Line 1825 render_key(struct mchars *mc, struct str *key) |
|
Line 1897 render_key(struct mchars *mc, struct str *key) |
|
} |
} |
|
|
switch (*val) { |
switch (*val) { |
case (ASCII_HYPH): |
case ASCII_HYPH: |
buf[pos++] = '-'; |
buf[pos++] = '-'; |
val++; |
val++; |
continue; |
continue; |
case ('\t'): |
case '\t': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (ASCII_NBRSP): |
case ASCII_NBRSP: |
buf[pos++] = ' '; |
buf[pos++] = ' '; |
val++; |
val++; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (ASCII_BREAK): |
case ASCII_BREAK: |
continue; |
continue; |
default: |
default: |
break; |
break; |
Line 1852 render_key(struct mchars *mc, struct str *key) |
|
Line 1924 render_key(struct mchars *mc, struct str *key) |
|
* predefined character or special character. |
* predefined character or special character. |
*/ |
*/ |
|
|
esc = mandoc_escape |
esc = mandoc_escape((const char **)&val, |
((const char **)&val, &seq, &len); |
&seq, &len); |
if (ESCAPE_ERROR == esc) |
if (ESCAPE_ERROR == esc) |
break; |
break; |
if (ESCAPE_SPECIAL != esc) |
if (ESCAPE_SPECIAL != esc) |
Line 2064 dbclose(int real) |
|
Line 2136 dbclose(int real) |
|
} |
} |
|
|
switch (child = fork()) { |
switch (child = fork()) { |
case (-1): |
case -1: |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "&fork cmp"); |
say("", "&fork cmp"); |
return; |
return; |
case (0): |
case 0: |
execlp("cmp", "cmp", "-s", |
execlp("cmp", "cmp", "-s", |
tempfilename, MANDOC_DB, NULL); |
tempfilename, MANDOC_DB, NULL); |
say("", "&exec cmp"); |
say("", "&exec cmp"); |
Line 2090 dbclose(int real) |
|
Line 2162 dbclose(int real) |
|
|
|
*strrchr(tempfilename, '/') = '\0'; |
*strrchr(tempfilename, '/') = '\0'; |
switch (child = fork()) { |
switch (child = fork()) { |
case (-1): |
case -1: |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "&fork rm"); |
say("", "&fork rm"); |
return; |
return; |
case (0): |
case 0: |
execlp("rm", "rm", "-rf", tempfilename, NULL); |
execlp("rm", "rm", "-rf", tempfilename, NULL); |
say("", "&exec rm"); |
say("", "&exec rm"); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
Line 2125 dbopen(int real) |
|
Line 2197 dbopen(int real) |
|
const char *sql; |
const char *sql; |
int rc, ofl; |
int rc, ofl; |
|
|
if (nodb) |
if (nodb) |
return(1); |
return(1); |
|
|
*tempfilename = '\0'; |
*tempfilename = '\0'; |
Line 2145 dbopen(int real) |
|
Line 2217 dbopen(int real) |
|
|
|
remove(MANDOC_DB "~"); |
remove(MANDOC_DB "~"); |
rc = sqlite3_open_v2(MANDOC_DB "~", &db, ofl, NULL); |
rc = sqlite3_open_v2(MANDOC_DB "~", &db, ofl, NULL); |
if (SQLITE_OK == rc) |
if (SQLITE_OK == rc) |
goto create_tables; |
goto create_tables; |
if (MPARSE_QUICK & mparse_options) { |
if (MPARSE_QUICK & mparse_options) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
Line 2153 dbopen(int real) |
|
Line 2225 dbopen(int real) |
|
return(0); |
return(0); |
} |
} |
|
|
if (strlcpy(tempfilename, "/tmp/mandocdb.XXXXXX", |
(void)strlcpy(tempfilename, "/tmp/mandocdb.XXXXXX", |
sizeof(tempfilename)) >= sizeof(tempfilename)) { |
sizeof(tempfilename)); |
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say("", "/tmp/mandocdb.XXXXXX: Filename too long"); |
|
return(0); |
|
} |
|
if (NULL == mkdtemp(tempfilename)) { |
if (NULL == mkdtemp(tempfilename)) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "&%s", tempfilename); |
say("", "&%s", tempfilename); |
return(0); |
return(0); |
} |
} |
if (strlcat(tempfilename, "/" MANDOC_DB, |
(void)strlcat(tempfilename, "/" MANDOC_DB, |
sizeof(tempfilename)) >= sizeof(tempfilename)) { |
sizeof(tempfilename)); |
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say("", "%s/" MANDOC_DB ": Filename too long", |
|
tempfilename); |
|
return(0); |
|
} |
|
rc = sqlite3_open_v2(tempfilename, &db, ofl, NULL); |
rc = sqlite3_open_v2(tempfilename, &db, ofl, NULL); |
if (SQLITE_OK != rc) { |
if (SQLITE_OK != rc) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
Line 2338 say(const char *file, const char *format, ...) |
|
Line 2401 say(const char *file, const char *format, ...) |
|
use_errno = 1; |
use_errno = 1; |
if (NULL != format) { |
if (NULL != format) { |
switch (*format) { |
switch (*format) { |
case ('&'): |
case '&': |
format++; |
format++; |
break; |
break; |
case ('\0'): |
case '\0': |
format = NULL; |
format = NULL; |
break; |
break; |
default: |
default: |