version 1.196, 2015/09/16 09:50:29 |
version 1.203, 2015/10/13 22:59:54 |
|
|
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
|
#include <err.h> |
#include <errno.h> |
#include <errno.h> |
#include <fcntl.h> |
#include <fcntl.h> |
#if HAVE_FTS |
#if HAVE_FTS |
|
|
#include <string.h> |
#include <string.h> |
#include <unistd.h> |
#include <unistd.h> |
|
|
#if HAVE_OHASH |
|
#include <ohash.h> |
|
#else |
|
#include "compat_ohash.h" |
|
#endif |
|
#include <sqlite3.h> |
#include <sqlite3.h> |
|
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
|
#include "mandoc_ohash.h" |
#include "mandoc.h" |
#include "mandoc.h" |
#include "roff.h" |
#include "roff.h" |
#include "mdoc.h" |
#include "mdoc.h" |
Line 145 static void dbadd_mlink_name(const struct mlink *mlin |
|
Line 142 static void dbadd_mlink_name(const struct mlink *mlin |
|
static int dbopen(int); |
static int dbopen(int); |
static void dbprune(void); |
static void dbprune(void); |
static void filescan(const char *); |
static void filescan(const char *); |
static void *hash_alloc(size_t, void *); |
|
static void hash_free(void *, void *); |
|
static void *hash_calloc(size_t, size_t, void *); |
|
static void mlink_add(struct mlink *, const struct stat *); |
static void mlink_add(struct mlink *, const struct stat *); |
static void mlink_check(struct mpage *, struct mlink *); |
static void mlink_check(struct mpage *, struct mlink *); |
static void mlink_free(struct mlink *); |
static void mlink_free(struct mlink *); |
Line 189 static int set_basedir(const char *, int); |
|
Line 183 static int set_basedir(const char *, int); |
|
static int treescan(void); |
static int treescan(void); |
static size_t utf8(unsigned int, char [7]); |
static size_t utf8(unsigned int, char [7]); |
|
|
|
extern char *__progname; |
|
|
static char tempfilename[32]; |
static char tempfilename[32]; |
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 */ |
Line 200 static int write_utf8; /* write UTF-8 output; else A |
|
Line 195 static int write_utf8; /* write UTF-8 output; else A |
|
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 mchars *mchars; /* table of named characters */ |
|
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 */ |
static struct ohash names; /* table of all names */ |
static struct ohash names; /* table of all names */ |
|
|
mandocdb(int argc, char *argv[]) |
mandocdb(int argc, char *argv[]) |
{ |
{ |
struct manconf conf; |
struct manconf conf; |
struct ohash_info mpages_info, mlinks_info; |
|
struct mparse *mp; |
struct mparse *mp; |
const char *path_arg; |
const char *path_arg; |
size_t j, sz; |
size_t j, sz; |
Line 349 mandocdb(int argc, char *argv[]) |
|
Line 342 mandocdb(int argc, char *argv[]) |
|
memset(&conf, 0, sizeof(conf)); |
memset(&conf, 0, sizeof(conf)); |
memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *)); |
memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *)); |
|
|
mpages_info.alloc = mlinks_info.alloc = hash_alloc; |
|
mpages_info.calloc = mlinks_info.calloc = hash_calloc; |
|
mpages_info.free = mlinks_info.free = hash_free; |
|
mpages_info.data = mlinks_info.data = NULL; |
|
|
|
mpages_info.key_offset = offsetof(struct mpage, inodev); |
|
mlinks_info.key_offset = offsetof(struct mlink, file); |
|
|
|
progname = strrchr(argv[0], '/'); |
|
if (progname == NULL) |
|
progname = argv[0]; |
|
else |
|
++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 |
Line 370 mandocdb(int argc, char *argv[]) |
|
Line 349 mandocdb(int argc, char *argv[]) |
|
*/ |
*/ |
#define CHECKOP(_op, _ch) do \ |
#define CHECKOP(_op, _ch) do \ |
if (OP_DEFAULT != (_op)) { \ |
if (OP_DEFAULT != (_op)) { \ |
fprintf(stderr, "%s: -%c: Conflicting option\n", \ |
warnx("-%c: Conflicting option", (_ch)); \ |
progname, (_ch)); \ |
|
goto usage; \ |
goto usage; \ |
} while (/*CONSTCOND*/0) |
} while (/*CONSTCOND*/0) |
|
|
Line 407 mandocdb(int argc, char *argv[]) |
|
Line 385 mandocdb(int argc, char *argv[]) |
|
break; |
break; |
case 'T': |
case 'T': |
if (strcmp(optarg, "utf8")) { |
if (strcmp(optarg, "utf8")) { |
fprintf(stderr, "%s: -T%s: " |
warnx("-T%s: Unsupported output format", |
"Unsupported output format\n", |
optarg); |
progname, optarg); |
|
goto usage; |
goto usage; |
} |
} |
write_utf8 = 1; |
write_utf8 = 1; |
Line 436 mandocdb(int argc, char *argv[]) |
|
Line 413 mandocdb(int argc, char *argv[]) |
|
argv += optind; |
argv += optind; |
|
|
if (OP_CONFFILE == op && argc > 0) { |
if (OP_CONFFILE == op && argc > 0) { |
fprintf(stderr, "%s: -C: Too many arguments\n", |
warnx("-C: Too many arguments"); |
progname); |
|
goto usage; |
goto usage; |
} |
} |
|
|
exitcode = (int)MANDOCLEVEL_OK; |
exitcode = (int)MANDOCLEVEL_OK; |
mchars = mchars_alloc(); |
mchars_alloc(); |
mp = mparse_alloc(mparse_options, MANDOCLEVEL_BADARG, NULL, |
mp = mparse_alloc(mparse_options, MANDOCLEVEL_BADARG, NULL, NULL); |
mchars, NULL); |
mandoc_ohash_init(&mpages, 6, offsetof(struct mpage, inodev)); |
ohash_init(&mpages, 6, &mpages_info); |
mandoc_ohash_init(&mlinks, 6, offsetof(struct mlink, file)); |
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) { |
|
|
Line 516 mandocdb(int argc, char *argv[]) |
|
Line 491 mandocdb(int argc, char *argv[]) |
|
continue; |
continue; |
|
|
if (j) { |
if (j) { |
ohash_init(&mpages, 6, &mpages_info); |
mandoc_ohash_init(&mpages, 6, |
ohash_init(&mlinks, 6, &mlinks_info); |
offsetof(struct mpage, inodev)); |
|
mandoc_ohash_init(&mlinks, 6, |
|
offsetof(struct mlink, file)); |
} |
} |
|
|
if ( ! set_basedir(conf.manpath.paths[j], argc > 0)) |
if ( ! set_basedir(conf.manpath.paths[j], argc > 0)) |
Line 543 mandocdb(int argc, char *argv[]) |
|
Line 520 mandocdb(int argc, char *argv[]) |
|
out: |
out: |
manconf_free(&conf); |
manconf_free(&conf); |
mparse_free(mp); |
mparse_free(mp); |
mchars_free(mchars); |
mchars_free(); |
mpages_free(); |
mpages_free(); |
ohash_delete(&mpages); |
ohash_delete(&mpages); |
ohash_delete(&mlinks); |
ohash_delete(&mlinks); |
return(exitcode); |
return exitcode; |
usage: |
usage: |
fprintf(stderr, "usage: %s [-aDnpQ] [-C file] [-Tutf8]\n" |
fprintf(stderr, "usage: %s [-aDnpQ] [-C file] [-Tutf8]\n" |
" %s [-aDnpQ] [-Tutf8] dir ...\n" |
" %s [-aDnpQ] [-Tutf8] dir ...\n" |
" %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; |
} |
} |
|
|
/* |
/* |
|
|
|
|
f = fts_open((char * const *)argv, |
f = fts_open((char * const *)argv, |
FTS_PHYSICAL | FTS_NOCHDIR, NULL); |
FTS_PHYSICAL | FTS_NOCHDIR, NULL); |
if (NULL == f) { |
if (f == NULL) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "&fts_open"); |
say("", "&fts_open"); |
return(0); |
return 0; |
} |
} |
|
|
dsec = arch = NULL; |
dsec = arch = NULL; |
dform = FORM_NONE; |
dform = FORM_NONE; |
|
|
while (NULL != (ff = fts_read(f))) { |
while ((ff = fts_read(f)) != NULL) { |
path = ff->fts_path + 2; |
path = ff->fts_path + 2; |
switch (ff->fts_info) { |
switch (ff->fts_info) { |
|
|
|
|
* then get handled just like regular files. |
* then get handled just like regular files. |
*/ |
*/ |
case FTS_SL: |
case FTS_SL: |
if (NULL == realpath(path, buf)) { |
if (realpath(path, buf) == NULL) { |
if (warnings) |
if (warnings) |
say(path, "&realpath"); |
say(path, "&realpath"); |
continue; |
continue; |
|
|
continue; |
continue; |
} |
} |
/* Use logical inode to avoid mpages dupe. */ |
/* Use logical inode to avoid mpages dupe. */ |
if (-1 == stat(path, ff->fts_statp)) { |
if (stat(path, ff->fts_statp) == -1) { |
if (warnings) |
if (warnings) |
say(path, "&stat"); |
say(path, "&stat"); |
continue; |
continue; |
|
|
* stored directory data and handling the filename. |
* stored directory data and handling the filename. |
*/ |
*/ |
case FTS_F: |
case FTS_F: |
if (0 == strcmp(path, MANDOC_DB)) |
if ( ! strcmp(path, MANDOC_DB)) |
continue; |
continue; |
if ( ! use_all && ff->fts_level < 2) { |
if ( ! use_all && ff->fts_level < 2) { |
if (warnings) |
if (warnings) |
|
|
} |
} |
gzip = 0; |
gzip = 0; |
fsec = NULL; |
fsec = NULL; |
while (NULL == fsec) { |
while (fsec == NULL) { |
fsec = strrchr(ff->fts_name, '.'); |
fsec = strrchr(ff->fts_name, '.'); |
if (NULL == fsec || strcmp(fsec+1, "gz")) |
if (fsec == NULL || strcmp(fsec+1, "gz")) |
break; |
break; |
gzip = 1; |
gzip = 1; |
*fsec = '\0'; |
*fsec = '\0'; |
fsec = NULL; |
fsec = NULL; |
} |
} |
if (NULL == fsec) { |
if (fsec == NULL) { |
if ( ! use_all) { |
if ( ! use_all) { |
if (warnings) |
if (warnings) |
say(path, |
say(path, |
"No filename suffix"); |
"No filename suffix"); |
continue; |
continue; |
} |
} |
} else if (0 == strcmp(++fsec, "html")) { |
} else if ( ! strcmp(++fsec, "html")) { |
if (warnings) |
if (warnings) |
say(path, "Skip html"); |
say(path, "Skip html"); |
continue; |
continue; |
} else if (0 == strcmp(fsec, "ps")) { |
} else if ( ! strcmp(fsec, "ps")) { |
if (warnings) |
if (warnings) |
say(path, "Skip ps"); |
say(path, "Skip ps"); |
continue; |
continue; |
} else if (0 == strcmp(fsec, "pdf")) { |
} else if ( ! 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 && |
((dform == FORM_SRC && |
strncmp(fsec, dsec, strlen(dsec))) || |
strncmp(fsec, dsec, strlen(dsec))) || |
(FORM_CAT == dform && strcmp(fsec, "0")))) { |
(dform == FORM_CAT && strcmp(fsec, "0")))) { |
if (warnings) |
if (warnings) |
say(path, "Wrong filename suffix"); |
say(path, "Wrong filename suffix"); |
continue; |
continue; |
|
|
continue; |
continue; |
|
|
case FTS_D: |
case FTS_D: |
/* FALLTHROUGH */ |
|
case FTS_DP: |
case FTS_DP: |
break; |
break; |
|
|
|
|
* If we're not in use_all, enforce it. |
* If we're not in use_all, enforce it. |
*/ |
*/ |
cp = ff->fts_name; |
cp = ff->fts_name; |
if (FTS_DP == ff->fts_info) |
if (ff->fts_info == FTS_DP) { |
|
dform = FORM_NONE; |
|
dsec = NULL; |
break; |
break; |
|
} |
|
|
if (0 == strncmp(cp, "man", 3)) { |
if ( ! strncmp(cp, "man", 3)) { |
dform = FORM_SRC; |
dform = FORM_SRC; |
dsec = cp + 3; |
dsec = cp + 3; |
} else if (0 == strncmp(cp, "cat", 3)) { |
} else if ( ! strncmp(cp, "cat", 3)) { |
dform = FORM_CAT; |
dform = FORM_CAT; |
dsec = cp + 3; |
dsec = cp + 3; |
} else { |
} else { |
|
|
dsec = NULL; |
dsec = NULL; |
} |
} |
|
|
if (NULL != dsec || use_all) |
if (dsec != NULL || use_all) |
break; |
break; |
|
|
if (warnings) |
if (warnings) |
|
|
* Possibly our architecture. |
* Possibly our architecture. |
* If we're descending, keep tabs on it. |
* If we're descending, keep tabs on it. |
*/ |
*/ |
if (FTS_DP != ff->fts_info && NULL != dsec) |
if (ff->fts_info != FTS_DP && dsec != NULL) |
arch = ff->fts_name; |
arch = ff->fts_name; |
else |
else |
arch = NULL; |
arch = NULL; |
break; |
break; |
default: |
default: |
if (FTS_DP == ff->fts_info || use_all) |
if (ff->fts_info == FTS_DP || use_all) |
break; |
break; |
if (warnings) |
if (warnings) |
say(path, "Extraneous directory part"); |
say(path, "Extraneous directory part"); |
|
|
} |
} |
|
|
fts_close(f); |
fts_close(f); |
return(1); |
return 1; |
} |
} |
|
|
/* |
/* |
|
|
mpages_merge(struct mparse *mp) |
mpages_merge(struct mparse *mp) |
{ |
{ |
char any[] = "any"; |
char any[] = "any"; |
struct ohash_info str_info; |
|
struct mpage *mpage, *mpage_dest; |
struct mpage *mpage, *mpage_dest; |
struct mlink *mlink, *mlink_dest; |
struct mlink *mlink, *mlink_dest; |
struct roff_man *man; |
struct roff_man *man; |
Line 1113 mpages_merge(struct mparse *mp) |
|
Line 1091 mpages_merge(struct mparse *mp) |
|
int fd; |
int fd; |
unsigned int pslot; |
unsigned int pslot; |
|
|
str_info.alloc = hash_alloc; |
|
str_info.calloc = hash_calloc; |
|
str_info.free = hash_free; |
|
str_info.data = NULL; |
|
str_info.key_offset = offsetof(struct str, key); |
|
|
|
if ( ! nodb) |
if ( ! nodb) |
SQL_EXEC("BEGIN TRANSACTION"); |
SQL_EXEC("BEGIN TRANSACTION"); |
|
|
Line 1131 mpages_merge(struct mparse *mp) |
|
Line 1103 mpages_merge(struct mparse *mp) |
|
} |
} |
|
|
name_mask = NAME_MASK; |
name_mask = NAME_MASK; |
ohash_init(&names, 4, &str_info); |
mandoc_ohash_init(&names, 4, offsetof(struct str, key)); |
ohash_init(&strings, 6, &str_info); |
mandoc_ohash_init(&strings, 6, offsetof(struct str, key)); |
mparse_reset(mp); |
mparse_reset(mp); |
man = NULL; |
man = NULL; |
sodest = NULL; |
sodest = NULL; |
Line 1260 names_check(void) |
|
Line 1232 names_check(void) |
|
{ |
{ |
sqlite3_stmt *stmt; |
sqlite3_stmt *stmt; |
const char *name, *sec, *arch, *key; |
const char *name, *sec, *arch, *key; |
int irc; |
|
|
|
sqlite3_prepare_v2(db, |
sqlite3_prepare_v2(db, |
"SELECT name, sec, arch, key FROM (" |
"SELECT name, sec, arch, key FROM (" |
Line 1276 names_check(void) |
|
Line 1247 names_check(void) |
|
") USING (pageid);", |
") USING (pageid);", |
-1, &stmt, NULL); |
-1, &stmt, NULL); |
|
|
if (SQLITE_OK != sqlite3_bind_int64(stmt, 1, NAME_TITLE)) |
if (sqlite3_bind_int64(stmt, 1, NAME_TITLE) != SQLITE_OK) |
say("", "%s", sqlite3_errmsg(db)); |
say("", "%s", sqlite3_errmsg(db)); |
|
|
while (SQLITE_ROW == (irc = sqlite3_step(stmt))) { |
while (sqlite3_step(stmt) == SQLITE_ROW) { |
name = (const char *)sqlite3_column_text(stmt, 0); |
name = (const char *)sqlite3_column_text(stmt, 0); |
sec = (const char *)sqlite3_column_text(stmt, 1); |
sec = (const char *)sqlite3_column_text(stmt, 1); |
arch = (const char *)sqlite3_column_text(stmt, 2); |
arch = (const char *)sqlite3_column_text(stmt, 2); |
Line 1570 parse_mdoc(struct mpage *mpage, const struct roff_meta |
|
Line 1541 parse_mdoc(struct mpage *mpage, const struct roff_meta |
|
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 ROFFT_ELEM: |
case ROFFT_ELEM: |
/* FALLTHROUGH */ |
|
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
/* FALLTHROUGH */ |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
/* FALLTHROUGH */ |
|
case ROFFT_BODY: |
case ROFFT_BODY: |
/* FALLTHROUGH */ |
|
case ROFFT_TAIL: |
case ROFFT_TAIL: |
if (NULL != mdocs[n->tok].fp) |
if (NULL != mdocs[n->tok].fp) |
if (0 == (*mdocs[n->tok].fp)(mpage, meta, n)) |
if (0 == (*mdocs[n->tok].fp)(mpage, meta, n)) |
Line 1604 parse_mdoc_Fd(struct mpage *mpage, const struct roff_m |
|
Line 1571 parse_mdoc_Fd(struct mpage *mpage, const struct roff_m |
|
if (SEC_SYNOPSIS != n->sec || |
if (SEC_SYNOPSIS != n->sec || |
NULL == (n = n->child) || |
NULL == (n = n->child) || |
n->type != ROFFT_TEXT) |
n->type != ROFFT_TEXT) |
return(0); |
return 0; |
|
|
/* |
/* |
* Only consider those `Fd' macro fields that begin with an |
* Only consider those `Fd' macro fields that begin with an |
Line 1612 parse_mdoc_Fd(struct mpage *mpage, const struct roff_m |
|
Line 1579 parse_mdoc_Fd(struct mpage *mpage, const struct roff_m |
|
*/ |
*/ |
|
|
if (strcmp("#include", n->string)) |
if (strcmp("#include", n->string)) |
return(0); |
return 0; |
|
|
if ((n = n->next) == NULL || n->type != ROFFT_TEXT) |
if ((n = n->next) == NULL || n->type != ROFFT_TEXT) |
return(0); |
return 0; |
|
|
/* |
/* |
* Strip away the enclosing angle brackets and make sure we're |
* Strip away the enclosing angle brackets and make sure we're |
Line 1627 parse_mdoc_Fd(struct mpage *mpage, const struct roff_m |
|
Line 1594 parse_mdoc_Fd(struct mpage *mpage, const struct roff_m |
|
start++; |
start++; |
|
|
if (0 == (sz = strlen(start))) |
if (0 == (sz = strlen(start))) |
return(0); |
return 0; |
|
|
end = &start[(int)sz - 1]; |
end = &start[(int)sz - 1]; |
if ('>' == *end || '"' == *end) |
if ('>' == *end || '"' == *end) |
Line 1635 parse_mdoc_Fd(struct mpage *mpage, const struct roff_m |
|
Line 1602 parse_mdoc_Fd(struct mpage *mpage, const struct roff_m |
|
|
|
if (end > start) |
if (end > start) |
putkeys(mpage, start, end - start + 1, TYPE_In); |
putkeys(mpage, start, end - start + 1, TYPE_In); |
return(0); |
return 0; |
} |
} |
|
|
static void |
static void |
Line 1665 parse_mdoc_Fn(struct mpage *mpage, const struct roff_m |
|
Line 1632 parse_mdoc_Fn(struct mpage *mpage, const struct roff_m |
|
{ |
{ |
|
|
if (n->child == NULL) |
if (n->child == NULL) |
return(0); |
return 0; |
|
|
parse_mdoc_fname(mpage, n->child); |
parse_mdoc_fname(mpage, n->child); |
|
|
Line 1673 parse_mdoc_Fn(struct mpage *mpage, const struct roff_m |
|
Line 1640 parse_mdoc_Fn(struct mpage *mpage, const struct roff_m |
|
if (n->type == ROFFT_TEXT) |
if (n->type == ROFFT_TEXT) |
putkey(mpage, n->string, TYPE_Fa); |
putkey(mpage, n->string, TYPE_Fa); |
|
|
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 1682 parse_mdoc_Fo(struct mpage *mpage, const struct roff_m |
|
Line 1649 parse_mdoc_Fo(struct mpage *mpage, const struct roff_m |
|
{ |
{ |
|
|
if (n->type != ROFFT_HEAD) |
if (n->type != ROFFT_HEAD) |
return(1); |
return 1; |
|
|
if (n->child != NULL) |
if (n->child != NULL) |
parse_mdoc_fname(mpage, n->child); |
parse_mdoc_fname(mpage, n->child); |
|
|
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 1697 parse_mdoc_Xr(struct mpage *mpage, const struct roff_m |
|
Line 1664 parse_mdoc_Xr(struct mpage *mpage, const struct roff_m |
|
char *cp; |
char *cp; |
|
|
if (NULL == (n = n->child)) |
if (NULL == (n = n->child)) |
return(0); |
return 0; |
|
|
if (NULL == n->next) { |
if (NULL == n->next) { |
putkey(mpage, n->string, TYPE_Xr); |
putkey(mpage, n->string, TYPE_Xr); |
return(0); |
return 0; |
} |
} |
|
|
mandoc_asprintf(&cp, "%s(%s)", n->string, n->next->string); |
mandoc_asprintf(&cp, "%s(%s)", n->string, n->next->string); |
putkey(mpage, cp, TYPE_Xr); |
putkey(mpage, cp, TYPE_Xr); |
free(cp); |
free(cp); |
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 1717 parse_mdoc_Nd(struct mpage *mpage, const struct roff_m |
|
Line 1684 parse_mdoc_Nd(struct mpage *mpage, const struct roff_m |
|
|
|
if (n->type == ROFFT_BODY) |
if (n->type == ROFFT_BODY) |
deroff(&mpage->desc, n); |
deroff(&mpage->desc, n); |
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 1739 parse_mdoc_Nm(struct mpage *mpage, const struct roff_m |
|
Line 1706 parse_mdoc_Nm(struct mpage *mpage, const struct roff_m |
|
putkey(mpage, n->child->string, ROFFT_HEAD); |
putkey(mpage, n->child->string, ROFFT_HEAD); |
mpage->name_head_done = 1; |
mpage->name_head_done = 1; |
} |
} |
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 1747 parse_mdoc_Sh(struct mpage *mpage, const struct roff_m |
|
Line 1714 parse_mdoc_Sh(struct mpage *mpage, const struct roff_m |
|
const struct roff_node *n) |
const struct roff_node *n) |
{ |
{ |
|
|
return(n->sec == SEC_CUSTOM && n->type == ROFFT_HEAD); |
return n->sec == SEC_CUSTOM && n->type == ROFFT_HEAD; |
} |
} |
|
|
static int |
static int |
Line 1755 parse_mdoc_head(struct mpage *mpage, const struct roff |
|
Line 1722 parse_mdoc_head(struct mpage *mpage, const struct roff |
|
const struct roff_node *n) |
const struct roff_node *n) |
{ |
{ |
|
|
return(n->type == ROFFT_HEAD); |
return n->type == ROFFT_HEAD; |
} |
} |
|
|
static int |
static int |
Line 1763 parse_mdoc_body(struct mpage *mpage, const struct roff |
|
Line 1730 parse_mdoc_body(struct mpage *mpage, const struct roff |
|
const struct roff_node *n) |
const struct roff_node *n) |
{ |
{ |
|
|
return(n->type == ROFFT_BODY); |
return n->type == ROFFT_BODY; |
} |
} |
|
|
/* |
/* |
Line 1868 utf8(unsigned int cp, char out[7]) |
|
Line 1835 utf8(unsigned int cp, char out[7]) |
|
out[4] = (cp >> 6 & 63) | 128; |
out[4] = (cp >> 6 & 63) | 128; |
out[5] = (cp & 63) | 128; |
out[5] = (cp & 63) | 128; |
} else |
} else |
return(0); |
return 0; |
|
|
out[rc] = '\0'; |
out[rc] = '\0'; |
return(rc); |
return rc; |
} |
} |
|
|
/* |
/* |
Line 1929 render_string(char **public, size_t *psz) |
|
Line 1896 render_string(char **public, size_t *psz) |
|
case '\\': |
case '\\': |
break; |
break; |
case '\t': |
case '\t': |
/* FALLTHROUGH */ |
|
case ASCII_NBRSP: |
case ASCII_NBRSP: |
dst[dsz++] = ' '; |
dst[dsz++] = ' '; |
scp++; |
scp++; |
Line 1960 render_string(char **public, size_t *psz) |
|
Line 1926 render_string(char **public, size_t *psz) |
|
*/ |
*/ |
|
|
if (write_utf8) { |
if (write_utf8) { |
unicode = mchars_spec2cp(mchars, seq, seqlen); |
unicode = mchars_spec2cp(seq, seqlen); |
if (unicode <= 0) |
if (unicode <= 0) |
continue; |
continue; |
addsz = utf8(unicode, utfbuf); |
addsz = utf8(unicode, utfbuf); |
Line 1968 render_string(char **public, size_t *psz) |
|
Line 1934 render_string(char **public, size_t *psz) |
|
continue; |
continue; |
addcp = utfbuf; |
addcp = utfbuf; |
} else { |
} else { |
addcp = mchars_spec2str(mchars, seq, seqlen, &addsz); |
addcp = mchars_spec2str(seq, seqlen, &addsz); |
if (addcp == NULL) |
if (addcp == NULL) |
continue; |
continue; |
if (*addcp == ASCII_NBRSP) { |
if (*addcp == ASCII_NBRSP) { |
Line 1995 render_string(char **public, size_t *psz) |
|
Line 1961 render_string(char **public, size_t *psz) |
|
--*psz; |
--*psz; |
if (dst != NULL) { |
if (dst != NULL) { |
(*public)[*psz] = '\0'; |
(*public)[*psz] = '\0'; |
return(1); |
return 1; |
} else |
} else |
return(0); |
return 0; |
} |
} |
|
|
static void |
static void |
Line 2264 dbopen(int real) |
|
Line 2230 dbopen(int real) |
|
int rc, ofl; |
int rc, ofl; |
|
|
if (nodb) |
if (nodb) |
return(1); |
return 1; |
|
|
*tempfilename = '\0'; |
*tempfilename = '\0'; |
ofl = SQLITE_OPEN_READWRITE; |
ofl = SQLITE_OPEN_READWRITE; |
Line 2275 dbopen(int real) |
|
Line 2241 dbopen(int real) |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
if (SQLITE_CANTOPEN != rc) |
if (SQLITE_CANTOPEN != rc) |
say(MANDOC_DB, "%s", sqlite3_errstr(rc)); |
say(MANDOC_DB, "%s", sqlite3_errstr(rc)); |
return(0); |
return 0; |
} |
} |
goto prepare_statements; |
goto prepare_statements; |
} |
} |
Line 2289 dbopen(int real) |
|
Line 2255 dbopen(int real) |
|
if (MPARSE_QUICK & mparse_options) { |
if (MPARSE_QUICK & mparse_options) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say(MANDOC_DB "~", "%s", sqlite3_errstr(rc)); |
say(MANDOC_DB "~", "%s", sqlite3_errstr(rc)); |
return(0); |
return 0; |
} |
} |
|
|
(void)strlcpy(tempfilename, "/tmp/mandocdb.XXXXXX", |
(void)strlcpy(tempfilename, "/tmp/mandocdb.XXXXXX", |
Line 2297 dbopen(int real) |
|
Line 2263 dbopen(int real) |
|
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; |
} |
} |
(void)strlcat(tempfilename, "/" MANDOC_DB, |
(void)strlcat(tempfilename, "/" MANDOC_DB, |
sizeof(tempfilename)); |
sizeof(tempfilename)); |
Line 2305 dbopen(int real) |
|
Line 2271 dbopen(int real) |
|
if (SQLITE_OK != rc) { |
if (SQLITE_OK != rc) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "%s: %s", tempfilename, sqlite3_errstr(rc)); |
say("", "%s: %s", tempfilename, sqlite3_errstr(rc)); |
return(0); |
return 0; |
} |
} |
|
|
create_tables: |
create_tables: |
|
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say(MANDOC_DB, "%s", sqlite3_errmsg(db)); |
say(MANDOC_DB, "%s", sqlite3_errmsg(db)); |
sqlite3_close(db); |
sqlite3_close(db); |
return(0); |
return 0; |
} |
} |
|
|
prepare_statements: |
prepare_statements: |
Line 2354 prepare_statements: |
|
Line 2320 prepare_statements: |
|
say(MANDOC_DB, "PRAGMA foreign_keys: %s", |
say(MANDOC_DB, "PRAGMA foreign_keys: %s", |
sqlite3_errmsg(db)); |
sqlite3_errmsg(db)); |
sqlite3_close(db); |
sqlite3_close(db); |
return(0); |
return 0; |
} |
} |
|
|
sql = "DELETE FROM mpages WHERE pageid IN " |
sql = "DELETE FROM mpages WHERE pageid IN " |
Line 2388 prepare_statements: |
|
Line 2354 prepare_statements: |
|
say(MANDOC_DB, "PRAGMA synchronous: %s", |
say(MANDOC_DB, "PRAGMA synchronous: %s", |
sqlite3_errmsg(db)); |
sqlite3_errmsg(db)); |
sqlite3_close(db); |
sqlite3_close(db); |
return(0); |
return 0; |
} |
} |
#endif |
#endif |
|
|
return(1); |
return 1; |
} |
} |
|
|
static void * |
|
hash_calloc(size_t n, size_t sz, void *arg) |
|
{ |
|
|
|
return(mandoc_calloc(n, sz)); |
|
} |
|
|
|
static void * |
|
hash_alloc(size_t sz, void *arg) |
|
{ |
|
|
|
return(mandoc_malloc(sz)); |
|
} |
|
|
|
static void |
|
hash_free(void *p, void *arg) |
|
{ |
|
|
|
free(p); |
|
} |
|
|
|
static int |
static int |
set_basedir(const char *targetdir, int report_baddir) |
set_basedir(const char *targetdir, int report_baddir) |
{ |
{ |
Line 2455 set_basedir(const char *targetdir, int report_baddir) |
|
Line 2400 set_basedir(const char *targetdir, int report_baddir) |
|
if (2 == getcwd_status) { |
if (2 == getcwd_status) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "getcwd: %s", startdir); |
say("", "getcwd: %s", startdir); |
return(0); |
return 0; |
} |
} |
if (-1 == chdir(startdir)) { |
if (-1 == chdir(startdir)) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "&chdir %s", startdir); |
say("", "&chdir %s", startdir); |
return(0); |
return 0; |
} |
} |
} |
} |
|
|
Line 2474 set_basedir(const char *targetdir, int report_baddir) |
|
Line 2419 set_basedir(const char *targetdir, int report_baddir) |
|
exitcode = (int)MANDOCLEVEL_BADARG; |
exitcode = (int)MANDOCLEVEL_BADARG; |
say("", "&%s: realpath", targetdir); |
say("", "&%s: realpath", targetdir); |
} |
} |
return(0); |
return 0; |
} else if (-1 == chdir(basedir)) { |
} else if (-1 == chdir(basedir)) { |
if (report_baddir || errno != ENOENT) { |
if (report_baddir || errno != ENOENT) { |
exitcode = (int)MANDOCLEVEL_BADARG; |
exitcode = (int)MANDOCLEVEL_BADARG; |
say("", "&chdir"); |
say("", "&chdir"); |
} |
} |
return(0); |
return 0; |
} |
} |
chdir_status = 1; |
chdir_status = 1; |
cp = strchr(basedir, '\0'); |
cp = strchr(basedir, '\0'); |
Line 2488 set_basedir(const char *targetdir, int report_baddir) |
|
Line 2433 set_basedir(const char *targetdir, int report_baddir) |
|
if (cp - basedir >= PATH_MAX - 1) { |
if (cp - basedir >= PATH_MAX - 1) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "Filename too long"); |
say("", "Filename too long"); |
return(0); |
return 0; |
} |
} |
*cp++ = '/'; |
*cp++ = '/'; |
*cp = '\0'; |
*cp = '\0'; |
} |
} |
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |