version 1.143, 2014/04/23 19:09:16 |
version 1.163, 2014/09/07 03:00:21 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
|
#include <sys/types.h> |
#include <sys/stat.h> |
#include <sys/stat.h> |
#include <sys/wait.h> |
#include <sys/wait.h> |
|
|
|
|
#include <ctype.h> |
#include <ctype.h> |
#include <errno.h> |
#include <errno.h> |
#include <fcntl.h> |
#include <fcntl.h> |
|
#if HAVE_FTS |
#include <fts.h> |
#include <fts.h> |
|
#else |
|
#include "compat_fts.h" |
|
#endif |
#include <getopt.h> |
#include <getopt.h> |
#include <limits.h> |
#include <limits.h> |
#include <stddef.h> |
#include <stddef.h> |
|
|
#include <string.h> |
#include <string.h> |
#include <unistd.h> |
#include <unistd.h> |
|
|
#ifdef HAVE_OHASH |
#if HAVE_OHASH |
#include <ohash.h> |
#include <ohash.h> |
#else |
#else |
#include "compat_ohash.h" |
#include "compat_ohash.h" |
|
|
OP_TEST /* change no databases, report potential problems */ |
OP_TEST /* change no databases, report potential problems */ |
}; |
}; |
|
|
enum form { |
|
FORM_NONE, /* format is unknown */ |
|
FORM_SRC, /* format is -man or -mdoc */ |
|
FORM_CAT /* format is cat */ |
|
}; |
|
|
|
struct str { |
struct str { |
char *rendered; /* key in UTF-8 or ASCII form */ |
char *rendered; /* key in UTF-8 or ASCII form */ |
const struct mpage *mpage; /* if set, the owning parse */ |
const struct mpage *mpage; /* if set, the owning parse */ |
|
|
struct mpage { |
struct mpage { |
struct inodev inodev; /* used for hashing routine */ |
struct inodev inodev; /* used for hashing routine */ |
int64_t pageid; /* pageid in mpages SQL table */ |
int64_t pageid; /* pageid in mpages SQL table */ |
enum form form; /* format from file content */ |
|
char *sec; /* section from file content */ |
char *sec; /* section from file content */ |
char *arch; /* architecture from file content */ |
char *arch; /* architecture from file content */ |
char *title; /* title from file content */ |
char *title; /* title from file content */ |
char *desc; /* description from file content */ |
char *desc; /* description from file content */ |
struct mlink *mlinks; /* singly linked list */ |
struct mlink *mlinks; /* singly linked list */ |
|
int form; /* format from file content */ |
}; |
}; |
|
|
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 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) */ |
char *fsec; /* section from file name suffix */ |
char *fsec; /* section from file name suffix */ |
struct mlink *next; /* singly linked list */ |
struct mlink *next; /* singly linked list */ |
struct mpage *mpage; /* parent */ |
struct mpage *mpage; /* parent */ |
|
int dform; /* format from directory */ |
|
int fform; /* format from file name suffix */ |
int gzip; /* filename has a .gz suffix */ |
int gzip; /* filename has a .gz suffix */ |
}; |
}; |
|
|
Line 145 static int dbopen(int); |
|
Line 142 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_alloc(size_t, void *); |
static void hash_free(void *, size_t, void *); |
static void hash_free(void *, void *); |
static void *hash_halloc(size_t, 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 336 main(int argc, char *argv[]) |
|
Line 333 main(int argc, char *argv[]) |
|
memset(&dirs, 0, sizeof(struct manpaths)); |
memset(&dirs, 0, sizeof(struct manpaths)); |
|
|
mpages_info.alloc = mlinks_info.alloc = hash_alloc; |
mpages_info.alloc = mlinks_info.alloc = hash_alloc; |
mpages_info.halloc = mlinks_info.halloc = hash_halloc; |
mpages_info.calloc = mlinks_info.calloc = hash_calloc; |
mpages_info.hfree = mlinks_info.hfree = hash_free; |
mpages_info.free = mlinks_info.free = hash_free; |
|
|
mpages_info.key_offset = offsetof(struct mpage, inodev); |
mpages_info.key_offset = offsetof(struct mpage, inodev); |
mlinks_info.key_offset = offsetof(struct mlink, file); |
mlinks_info.key_offset = offsetof(struct mlink, file); |
Line 355 main(int argc, char *argv[]) |
|
Line 352 main(int argc, char *argv[]) |
|
*/ |
*/ |
#define CHECKOP(_op, _ch) do \ |
#define CHECKOP(_op, _ch) do \ |
if (OP_DEFAULT != (_op)) { \ |
if (OP_DEFAULT != (_op)) { \ |
fprintf(stderr, "-%c: Conflicting option\n", (_ch)); \ |
fprintf(stderr, "%s: -%c: Conflicting option\n", \ |
|
progname, (_ch)); \ |
goto usage; \ |
goto usage; \ |
} while (/*CONSTCOND*/0) |
} while (/*CONSTCOND*/0) |
|
|
Line 391 main(int argc, char *argv[]) |
|
Line 389 main(int argc, char *argv[]) |
|
break; |
break; |
case 'T': |
case 'T': |
if (strcmp(optarg, "utf8")) { |
if (strcmp(optarg, "utf8")) { |
fprintf(stderr, "-T%s: Unsupported " |
fprintf(stderr, "%s: -T%s: " |
"output format\n", optarg); |
"Unsupported output format\n", |
|
progname, optarg); |
goto usage; |
goto usage; |
} |
} |
write_utf8 = 1; |
write_utf8 = 1; |
Line 419 main(int argc, char *argv[]) |
|
Line 418 main(int argc, char *argv[]) |
|
argv += optind; |
argv += optind; |
|
|
if (OP_CONFFILE == op && argc > 0) { |
if (OP_CONFFILE == op && argc > 0) { |
fprintf(stderr, "-C: Too many arguments\n"); |
fprintf(stderr, "%s: -C: Too many arguments\n", |
|
progname); |
goto usage; |
goto usage; |
} |
} |
|
|
Line 433 main(int argc, char *argv[]) |
|
Line 433 main(int argc, char *argv[]) |
|
if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) { |
if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) { |
|
|
/* |
/* |
* All of these deal with a specific directory. |
* Most of these deal with a specific directory. |
* Jump into that directory first. |
* Jump into that directory first. |
*/ |
*/ |
if (0 == set_basedir(path_arg)) |
if (OP_TEST != op && 0 == set_basedir(path_arg)) |
goto out; |
goto out; |
|
|
if (dbopen(1)) { |
if (dbopen(1)) { |
Line 471 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(argc, |
dirs.paths = mandoc_reallocarray(NULL, |
sizeof(char *)); |
argc, 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]); |
Line 506 main(int argc, char *argv[]) |
|
Line 506 main(int argc, char *argv[]) |
|
goto out; |
goto out; |
if (0 == treescan()) |
if (0 == treescan()) |
goto out; |
goto out; |
if (0 == set_basedir(dirs.paths[j])) |
|
goto out; |
|
if (0 == dbopen(0)) |
if (0 == dbopen(0)) |
goto out; |
goto out; |
|
|
mpages_merge(mc, mp); |
mpages_merge(mc, mp); |
if (warnings && |
if (warnings && !nodb && |
! (MPARSE_QUICK & mparse_options)) |
! (MPARSE_QUICK & mparse_options)) |
names_check(); |
names_check(); |
dbclose(0); |
dbclose(0); |
Line 525 main(int argc, char *argv[]) |
|
Line 523 main(int argc, char *argv[]) |
|
} |
} |
} |
} |
out: |
out: |
set_basedir(NULL); |
|
manpath_free(&dirs); |
manpath_free(&dirs); |
mchars_free(mc); |
mchars_free(mc); |
mparse_free(mp); |
mparse_free(mp); |
Line 800 filescan(const char *file) |
|
Line 797 filescan(const char *file) |
|
return; |
return; |
} |
} |
|
|
if (strstr(buf, basedir) == buf) |
if (OP_TEST == op) |
start = buf + strlen(basedir) + 1; |
|
else if (OP_TEST == op) |
|
start = buf; |
start = buf; |
|
else if (strstr(buf, basedir) == buf) |
|
start = buf + strlen(basedir); |
else { |
else { |
exitcode = (int)MANDOCLEVEL_BADARG; |
exitcode = (int)MANDOCLEVEL_BADARG; |
say("", "%s: outside base directory", buf); |
say("", "%s: outside base directory", buf); |
Line 829 filescan(const char *file) |
|
Line 826 filescan(const char *file) |
|
say(file, "Filename too long"); |
say(file, "Filename too long"); |
return; |
return; |
} |
} |
start = strstr(buf, basedir) == buf ? |
start = buf; |
buf + strlen(basedir) + 1 : buf; |
if (OP_TEST != op && strstr(buf, basedir) == buf) |
|
start += strlen(basedir); |
} |
} |
|
|
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
|
mlink->dform = FORM_NONE; |
if (strlcpy(mlink->file, start, sizeof(mlink->file)) >= |
if (strlcpy(mlink->file, start, sizeof(mlink->file)) >= |
sizeof(mlink->file)) { |
sizeof(mlink->file)) { |
say(start, "Filename too long"); |
say(start, "Filename too long"); |
Line 1077 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1076 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
{ |
{ |
char any[] = "any"; |
char any[] = "any"; |
struct ohash_info str_info; |
struct ohash_info str_info; |
int fd[2]; |
|
struct mpage *mpage, *mpage_dest; |
struct mpage *mpage, *mpage_dest; |
struct mlink *mlink, *mlink_dest; |
struct mlink *mlink, *mlink_dest; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
Line 1085 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1083 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
char *sodest; |
char *sodest; |
char *cp; |
char *cp; |
pid_t child_pid; |
pid_t child_pid; |
int status; |
int fd; |
unsigned int pslot; |
unsigned int pslot; |
enum mandoclevel lvl; |
enum mandoclevel lvl; |
|
|
str_info.alloc = hash_alloc; |
str_info.alloc = hash_alloc; |
str_info.halloc = hash_halloc; |
str_info.calloc = hash_calloc; |
str_info.hfree = hash_free; |
str_info.free = hash_free; |
str_info.key_offset = offsetof(struct str, key); |
str_info.key_offset = offsetof(struct str, key); |
|
|
if (0 == nodb) |
if (0 == nodb) |
Line 1113 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1111 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
man = NULL; |
man = NULL; |
sodest = NULL; |
sodest = NULL; |
child_pid = 0; |
child_pid = 0; |
fd[0] = -1; |
|
fd[1] = -1; |
|
|
|
if (mpage->mlinks->gzip) { |
mparse_open(mp, &fd, mpage->mlinks->file, &child_pid); |
if (-1 == pipe(fd)) { |
if (fd == -1) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say(mpage->mlinks->file, "&open"); |
say(mpage->mlinks->file, "&pipe gunzip"); |
goto nextpage; |
goto nextpage; |
|
} |
|
switch (child_pid = fork()) { |
|
case -1: |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(mpage->mlinks->file, "&fork gunzip"); |
|
child_pid = 0; |
|
close(fd[1]); |
|
close(fd[0]); |
|
goto nextpage; |
|
case 0: |
|
close(fd[0]); |
|
if (-1 == dup2(fd[1], STDOUT_FILENO)) { |
|
say(mpage->mlinks->file, |
|
"&dup gunzip"); |
|
exit(1); |
|
} |
|
execlp("gunzip", "gunzip", "-c", |
|
mpage->mlinks->file, NULL); |
|
say(mpage->mlinks->file, "&exec gunzip"); |
|
exit(1); |
|
default: |
|
close(fd[1]); |
|
break; |
|
} |
|
} |
} |
|
|
/* |
/* |
Line 1154 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1125 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
*/ |
*/ |
if (FORM_CAT != mpage->mlinks->dform || |
if (FORM_CAT != mpage->mlinks->dform || |
FORM_CAT != mpage->mlinks->fform) { |
FORM_CAT != mpage->mlinks->fform) { |
lvl = mparse_readfd(mp, fd[0], mpage->mlinks->file); |
lvl = mparse_readfd(mp, fd, mpage->mlinks->file); |
if (lvl < MANDOCLEVEL_FATAL) |
if (lvl < MANDOCLEVEL_FATAL) |
mparse_result(mp, &mdoc, &man, &sodest); |
mparse_result(mp, &mdoc, &man, &sodest); |
} |
} |
Line 1197 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1168 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
goto nextpage; |
goto nextpage; |
} else if (NULL != mdoc) { |
} else if (NULL != mdoc) { |
mpage->form = FORM_SRC; |
mpage->form = FORM_SRC; |
mpage->sec = |
mpage->sec = mdoc_meta(mdoc)->msec; |
mandoc_strdup(mdoc_meta(mdoc)->msec); |
mpage->sec = mandoc_strdup( |
|
NULL == mpage->sec ? "" : mpage->sec); |
mpage->arch = mdoc_meta(mdoc)->arch; |
mpage->arch = mdoc_meta(mdoc)->arch; |
mpage->arch = mandoc_strdup( |
mpage->arch = mandoc_strdup( |
NULL == mpage->arch ? "" : mpage->arch); |
NULL == mpage->arch ? "" : mpage->arch); |
Line 1221 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1193 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
mpage->title = |
mpage->title = |
mandoc_strdup(mpage->mlinks->name); |
mandoc_strdup(mpage->mlinks->name); |
} |
} |
|
if (mpage->mlinks->gzip) |
|
mpage->form |= FORM_GZ; |
putkey(mpage, mpage->sec, TYPE_sec); |
putkey(mpage, mpage->sec, TYPE_sec); |
putkey(mpage, '\0' == *mpage->arch ? |
putkey(mpage, '\0' == *mpage->arch ? |
any : mpage->arch, TYPE_arch); |
any : mpage->arch, TYPE_arch); |
Line 1243 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1217 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
} else if (NULL != man) |
} else if (NULL != man) |
parse_man(mpage, man_node(man)); |
parse_man(mpage, man_node(man)); |
else |
else |
parse_cat(mpage, fd[0]); |
parse_cat(mpage, fd); |
if (NULL == mpage->desc) |
if (NULL == mpage->desc) |
mpage->desc = mandoc_strdup(mpage->mlinks->name); |
mpage->desc = mandoc_strdup(mpage->mlinks->name); |
|
|
Line 1255 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1229 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
dbadd(mpage, mc); |
dbadd(mpage, mc); |
|
|
nextpage: |
nextpage: |
if (child_pid) { |
if (child_pid && |
if (-1 == waitpid(child_pid, &status, 0)) { |
mparse_wait(mp, child_pid) != MANDOCLEVEL_OK) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say(mpage->mlinks->file, "&wait gunzip"); |
say(mpage->mlinks->file, "&wait gunzip"); |
} else if (WIFSIGNALED(status)) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(mpage->mlinks->file, |
|
"gunzip died from signal %d", |
|
WTERMSIG(status)); |
|
} else if (WEXITSTATUS(status)) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(mpage->mlinks->file, |
|
"gunzip failed with code %d", |
|
WEXITSTATUS(status)); |
|
} |
|
} |
} |
ohash_delete(&strings); |
ohash_delete(&strings); |
ohash_delete(&names); |
ohash_delete(&names); |
Line 1305 names_check(void) |
|
Line 1268 names_check(void) |
|
say("", "%s", sqlite3_errmsg(db)); |
say("", "%s", sqlite3_errmsg(db)); |
|
|
while (SQLITE_ROW == (irc = sqlite3_step(stmt))) { |
while (SQLITE_ROW == (irc = sqlite3_step(stmt))) { |
name = sqlite3_column_text(stmt, 0); |
name = (const char *)sqlite3_column_text(stmt, 0); |
sec = sqlite3_column_text(stmt, 1); |
sec = (const char *)sqlite3_column_text(stmt, 1); |
arch = sqlite3_column_text(stmt, 2); |
arch = (const char *)sqlite3_column_text(stmt, 2); |
key = sqlite3_column_text(stmt, 3); |
key = (const char *)sqlite3_column_text(stmt, 3); |
say("", "%s(%s%s%s) lacks mlink \"%s\"", name, sec, |
say("", "%s(%s%s%s) lacks mlink \"%s\"", name, sec, |
'\0' == *arch ? "" : "/", |
'\0' == *arch ? "" : "/", |
'\0' == *arch ? "" : arch, key); |
'\0' == *arch ? "" : arch, key); |
Line 1327 parse_cat(struct mpage *mpage, int fd) |
|
Line 1290 parse_cat(struct mpage *mpage, int fd) |
|
fopen(mpage->mlinks->file, "r") : |
fopen(mpage->mlinks->file, "r") : |
fdopen(fd, "r"); |
fdopen(fd, "r"); |
if (NULL == stream) { |
if (NULL == stream) { |
|
if (-1 != fd) |
|
close(fd); |
if (warnings) |
if (warnings) |
say(mpage->mlinks->file, "&fopen"); |
say(mpage->mlinks->file, "&fopen"); |
return; |
return; |
Line 1770 putkeys(const struct mpage *mpage, |
|
Line 1735 putkeys(const struct mpage *mpage, |
|
htab = &strings; |
htab = &strings; |
if (debug > 1) |
if (debug > 1) |
for (i = 0; i < mansearch_keymax; i++) |
for (i = 0; i < mansearch_keymax; i++) |
if (1 << i & v) |
if ((uint64_t)1 << i & v) |
say(mpage->mlinks->file, |
say(mpage->mlinks->file, |
"Adding key %s=%*s", |
"Adding key %s=%*s", |
mansearch_keynames[i], sz, cp); |
mansearch_keynames[i], sz, cp); |
Line 1784 putkeys(const struct mpage *mpage, |
|
Line 1749 putkeys(const struct mpage *mpage, |
|
s->mask |= v; |
s->mask |= v; |
return; |
return; |
} else if (NULL == s) { |
} else if (NULL == s) { |
s = mandoc_calloc(sizeof(struct str) + sz + 1, 1); |
s = mandoc_calloc(1, sizeof(struct str) + sz + 1); |
memcpy(s->key, cp, sz); |
memcpy(s->key, cp, sz); |
ohash_insert(htab, slot, s); |
ohash_insert(htab, slot, s); |
} |
} |
Line 1977 dbadd_mlink(const struct mlink *mlink) |
|
Line 1942 dbadd_mlink(const struct mlink *mlink) |
|
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->pageid); |
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->pageid); |
SQL_STEP(stmts[STMT_INSERT_LINK]); |
SQL_STEP(stmts[STMT_INSERT_LINK]); |
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
|
|
|
i = 1; |
|
SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, NAME_FILE); |
|
SQL_BIND_TEXT(stmts[STMT_INSERT_NAME], i, mlink->name); |
|
SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, mlink->mpage->pageid); |
|
SQL_STEP(stmts[STMT_INSERT_NAME]); |
|
sqlite3_reset(stmts[STMT_INSERT_NAME]); |
} |
} |
|
|
/* |
/* |
Line 1996 dbadd(struct mpage *mpage, struct mchars *mc) |
|
Line 1968 dbadd(struct mpage *mpage, struct mchars *mc) |
|
mlink = mpage->mlinks; |
mlink = mpage->mlinks; |
|
|
if (nodb) { |
if (nodb) { |
|
for (key = ohash_first(&names, &slot); NULL != key; |
|
key = ohash_next(&names, &slot)) { |
|
if (key->rendered != key->key) |
|
free(key->rendered); |
|
free(key); |
|
} |
|
for (key = ohash_first(&strings, &slot); NULL != key; |
|
key = ohash_next(&strings, &slot)) { |
|
if (key->rendered != key->key) |
|
free(key->rendered); |
|
free(key); |
|
} |
|
if (0 == debug) |
|
return; |
while (NULL != mlink) { |
while (NULL != mlink) { |
fputs(mlink->name, stdout); |
fputs(mlink->name, stdout); |
if (NULL == mlink->next || |
if (NULL == mlink->next || |
Line 2022 dbadd(struct mpage *mpage, struct mchars *mc) |
|
Line 2008 dbadd(struct mpage *mpage, struct mchars *mc) |
|
if (debug) |
if (debug) |
say(mlink->file, "Adding to database"); |
say(mlink->file, "Adding to database"); |
|
|
|
i = strlen(mpage->desc) + 1; |
|
key = mandoc_calloc(1, sizeof(struct str) + i); |
|
memcpy(key->key, mpage->desc, i); |
|
render_key(mc, key); |
|
|
i = 1; |
i = 1; |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->desc); |
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, key->rendered); |
SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form); |
SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, mpage->form); |
SQL_STEP(stmts[STMT_INSERT_PAGE]); |
SQL_STEP(stmts[STMT_INSERT_PAGE]); |
mpage->pageid = sqlite3_last_insert_rowid(db); |
mpage->pageid = sqlite3_last_insert_rowid(db); |
sqlite3_reset(stmts[STMT_INSERT_PAGE]); |
sqlite3_reset(stmts[STMT_INSERT_PAGE]); |
|
|
|
if (key->rendered != key->key) |
|
free(key->rendered); |
|
free(key); |
|
|
while (NULL != mlink) { |
while (NULL != mlink) { |
dbadd_mlink(mlink); |
dbadd_mlink(mlink); |
mlink = mlink->next; |
mlink = mlink->next; |
Line 2207 dbopen(int real) |
|
Line 2202 dbopen(int real) |
|
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) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say(MANDOC_DB, "%s", sqlite3_errmsg(db)); |
if (SQLITE_CANTOPEN != rc) |
|
say(MANDOC_DB, "%s", sqlite3_errstr(rc)); |
return(0); |
return(0); |
} |
} |
goto prepare_statements; |
goto prepare_statements; |
Line 2221 dbopen(int real) |
|
Line 2217 dbopen(int real) |
|
goto create_tables; |
goto create_tables; |
if (MPARSE_QUICK & mparse_options) { |
if (MPARSE_QUICK & mparse_options) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say(MANDOC_DB "~", "%s", sqlite3_errmsg(db)); |
say(MANDOC_DB "~", "%s", sqlite3_errstr(rc)); |
return(0); |
return(0); |
} |
} |
|
|
Line 2237 dbopen(int real) |
|
Line 2233 dbopen(int real) |
|
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; |
say("", "%s: %s", tempfilename, sqlite3_errmsg(db)); |
say("", "%s: %s", tempfilename, sqlite3_errstr(rc)); |
return(0); |
return(0); |
} |
} |
|
|
|
|
if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) { |
if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) { |
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); |
return(0); |
return(0); |
} |
} |
|
|
prepare_statements: |
prepare_statements: |
SQL_EXEC("PRAGMA foreign_keys = ON"); |
if (SQLITE_OK != sqlite3_exec(db, |
|
"PRAGMA foreign_keys = ON", NULL, NULL, NULL)) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(MANDOC_DB, "PRAGMA foreign_keys: %s", |
|
sqlite3_errmsg(db)); |
|
sqlite3_close(db); |
|
return(0); |
|
} |
|
|
sql = "DELETE FROM mpages WHERE pageid IN " |
sql = "DELETE FROM mpages WHERE pageid IN " |
"(SELECT pageid FROM mlinks WHERE " |
"(SELECT pageid FROM mlinks WHERE " |
"sec=? AND arch=? AND name=?)"; |
"sec=? AND arch=? AND name=?)"; |
Line 2303 prepare_statements: |
|
Line 2308 prepare_statements: |
|
* synchronous mode for much better performance. |
* synchronous mode for much better performance. |
*/ |
*/ |
|
|
if (real) |
if (real && SQLITE_OK != sqlite3_exec(db, |
SQL_EXEC("PRAGMA synchronous = OFF"); |
"PRAGMA synchronous = OFF", NULL, NULL, NULL)) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(MANDOC_DB, "PRAGMA synchronous: %s", |
|
sqlite3_errmsg(db)); |
|
sqlite3_close(db); |
|
return(0); |
|
} |
#endif |
#endif |
|
|
return(1); |
return(1); |
} |
} |
|
|
static void * |
static void * |
hash_halloc(size_t sz, void *arg) |
hash_calloc(size_t n, size_t sz, void *arg) |
{ |
{ |
|
|
return(mandoc_calloc(sz, 1)); |
return(mandoc_calloc(n, sz)); |
} |
} |
|
|
static void * |
static void * |
Line 2325 hash_alloc(size_t sz, void *arg) |
|
Line 2336 hash_alloc(size_t sz, void *arg) |
|
} |
} |
|
|
static void |
static void |
hash_free(void *p, size_t sz, void *arg) |
hash_free(void *p, void *arg) |
{ |
{ |
|
|
free(p); |
free(p); |
|
|
set_basedir(const char *targetdir) |
set_basedir(const char *targetdir) |
{ |
{ |
static char startdir[PATH_MAX]; |
static char startdir[PATH_MAX]; |
static int fd; |
static int getcwd_status; /* 1 = ok, 2 = failure */ |
|
static int chdir_status; /* 1 = changed directory */ |
|
char *cp; |
|
|
/* |
/* |
* Remember where we started by keeping a fd open to the origin |
* Remember the original working directory, if possible. |
* path component: throughout this utility, we chdir() a lot to |
* This will be needed if the second or a later directory |
* handle relative paths, and by doing this, we can return to |
* on the command line is given as a relative path. |
* the starting point. |
* Do not error out if the current directory is not |
|
* searchable: Maybe it won't be needed after all. |
*/ |
*/ |
if ('\0' == *startdir) { |
if (0 == getcwd_status) { |
if (NULL == getcwd(startdir, PATH_MAX)) { |
if (NULL == getcwd(startdir, sizeof(startdir))) { |
|
getcwd_status = 2; |
|
(void)strlcpy(startdir, strerror(errno), |
|
sizeof(startdir)); |
|
} else |
|
getcwd_status = 1; |
|
} |
|
|
|
/* |
|
* We are leaving the old base directory. |
|
* Do not use it any longer, not even for messages. |
|
*/ |
|
*basedir = '\0'; |
|
|
|
/* |
|
* If and only if the directory was changed earlier and |
|
* the next directory to process is given as a relative path, |
|
* first go back, or bail out if that is impossible. |
|
*/ |
|
if (chdir_status && '/' != *targetdir) { |
|
if (2 == getcwd_status) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
if (NULL != targetdir) |
say("", "getcwd: %s", startdir); |
say("", "&getcwd"); |
|
return(0); |
return(0); |
} |
} |
if (-1 == (fd = open(startdir, O_RDONLY, 0))) { |
if (-1 == chdir(startdir)) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say("", "&open %s", startdir); |
|
return(0); |
|
} |
|
if (NULL == targetdir) |
|
targetdir = startdir; |
|
} else { |
|
if (-1 == fd) |
|
return(0); |
|
if (-1 == fchdir(fd)) { |
|
close(fd); |
|
basedir[0] = '\0'; |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say("", "&chdir %s", startdir); |
say("", "&chdir %s", startdir); |
return(0); |
return(0); |
} |
} |
if (NULL == targetdir) { |
|
close(fd); |
|
return(1); |
|
} |
|
} |
} |
|
|
|
/* |
|
* Always resolve basedir to the canonicalized absolute |
|
* pathname and append a trailing slash, such that |
|
* we can reliably check whether files are inside. |
|
*/ |
if (NULL == realpath(targetdir, basedir)) { |
if (NULL == realpath(targetdir, basedir)) { |
basedir[0] = '\0'; |
|
exitcode = (int)MANDOCLEVEL_BADARG; |
exitcode = (int)MANDOCLEVEL_BADARG; |
say("", "&%s: realpath", targetdir); |
say("", "&%s: realpath", targetdir); |
return(0); |
return(0); |
Line 2382 set_basedir(const char *targetdir) |
|
Line 2404 set_basedir(const char *targetdir) |
|
say("", "&chdir"); |
say("", "&chdir"); |
return(0); |
return(0); |
} |
} |
|
chdir_status = 1; |
|
cp = strchr(basedir, '\0'); |
|
if ('/' != cp[-1]) { |
|
if (cp - basedir >= PATH_MAX - 1) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say("", "Filename too long"); |
|
return(0); |
|
} |
|
*cp++ = '/'; |
|
*cp = '\0'; |
|
} |
return(1); |
return(1); |
} |
} |
|
|
Line 2394 say(const char *file, const char *format, ...) |
|
Line 2427 say(const char *file, const char *format, ...) |
|
if ('\0' != *basedir) |
if ('\0' != *basedir) |
fprintf(stderr, "%s", basedir); |
fprintf(stderr, "%s", basedir); |
if ('\0' != *basedir && '\0' != *file) |
if ('\0' != *basedir && '\0' != *file) |
fputs("//", stderr); |
fputc('/', stderr); |
if ('\0' != *file) |
if ('\0' != *file) |
fprintf(stderr, "%s", file); |
fprintf(stderr, "%s", file); |
|
|