mandoc/mandocdb.c - diff

Return to mandocdb.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandocdb.c between version 1.101 and 1.106

version 1.101, 2014/01/05 04:48:40

version 1.106, 2014/01/06 15:32:47

Line 130 struct mdoc_handler {

};

static void dbclose(int);

static void dbindex(const struct mpage *, struct mchars *);

static void dbadd(const struct mpage *, struct mchars *);

static int dbopen(int);

static void dbprune(void);

static void filescan(const char *);

Line 167 static int treescan(void);

static size_t utf8(unsigned int, char [7]);

static char *progname;

static int use_all; /* use all found files */

static int nodb; /* no database changes */

static int quick; /* abort the parse early */

static int use_all; /* use all found files */

static int verb; /* print what we're doing */

static int warnings; /* warn about crap */

static int write_utf8; /* write UTF-8 output; else ASCII */

Line 347 main(int argc, char *argv[])

Line 348 main(int argc, char *argv[])

path_arg = NULL;

op = OP_DEFAULT;

while (-1 != (ch = getopt(argc, argv, "aC:d:nT:tu:vW")))

while (-1 != (ch = getopt(argc, argv, "aC:d:nQT:tu:vW")))

switch (ch) {

case ('a'):

use_all = 1;

Line 365 main(int argc, char *argv[])

Line 366 main(int argc, char *argv[])

case ('n'):

nodb = 1;

break;

case ('Q'):

quick = 1;

break;

case ('T'):

if (strcmp(optarg, "utf8")) {

fprintf(stderr, "-T%s: Unsupported "

Line 404 main(int argc, char *argv[])

Line 408 main(int argc, char *argv[])

exitcode = (int)MANDOCLEVEL_OK;

mp = mparse_alloc(MPARSE_AUTO,

MANDOCLEVEL_FATAL, NULL, NULL, NULL);

MANDOCLEVEL_FATAL, NULL, NULL, quick);

mc = mchars_alloc();

ohash_init(&mpages, 6, &mpages_info);

Line 494 out:

Line 498 out:

ohash_delete(&mlinks);

return(exitcode);

usage:

fprintf(stderr, "usage: %s [-anvW] [-C file] [-Tutf8]\n"

fprintf(stderr, "usage: %s [-anQvW] [-C file] [-Tutf8]\n"

" %s [-anvW] [-Tutf8] dir ...\n"

" %s [-anQvW] [-Tutf8] dir ...\n"

" %s [-nvW] [-Tutf8] -d dir [file ...]\n"

" %s [-nQvW] [-Tutf8] -d dir [file ...]\n"

" %s [-nvW] -u dir [file ...]\n"

" %s -t file ...\n",

" %s [-Q] -t file ...\n",

progname, progname, progname,

progname, progname);

Line 696 filescan(const char *file)

Line 700 filescan(const char *file)

exitcode = (int)MANDOCLEVEL_BADARG;

say(file, NULL);

return;

} else if (OP_TEST != op && strstr(buf, basedir) != buf) {

}

if (strstr(buf, basedir) == buf)

start = buf + strlen(basedir) + 1;

else if (OP_TEST == op)

start = buf;

else {

exitcode = (int)MANDOCLEVEL_BADARG;

say("", "%s: outside base directory", buf);

return;

} else if (-1 == stat(buf, &st)) {

}

if (-1 == stat(buf, &st)) {

exitcode = (int)MANDOCLEVEL_BADARG;

say(file, NULL);

return;

Line 709 filescan(const char *file)

Line 721 filescan(const char *file)

say(file, "Not a regular file");

return;

}

start = buf + strlen(basedir);

mlink = mandoc_calloc(1, sizeof(struct mlink));

strlcpy(mlink->file, start, sizeof(mlink->file));

Line 1043 mpages_merge(struct mchars *mc, struct mparse *mp)

Line 1055 mpages_merge(struct mchars *mc, struct mparse *mp)

else

parse_cat(mpage);

dbindex(mpage, mc);

dbadd(mpage, mc);

ohash_delete(&strings);

mpage = ohash_next(&mpages, &pslot);

}

Line 1728 render_key(struct mchars *mc, struct str *key)

Line 1740 render_key(struct mchars *mc, struct str *key)

* Also, handle escape sequences at the last possible moment.

static void

dbindex(const struct mpage *mpage, struct mchars *mc)

dbadd(const struct mpage *mpage, struct mchars *mc)

{

struct mlink *mlink;

struct str *key;

const char *desc;

int64_t recno;

size_t i;

unsigned int slot;

if (verb)

say(mpage->mlinks->file, "Adding to index");

say(mpage->mlinks->file, "Adding to database");

if (nodb)

return;

desc = "";

if (NULL != mpage->desc && '\0' != *mpage->desc) {

key = ohash_find(&strings,

ohash_qlookup(&strings, mpage->desc));

assert(NULL != key);

if (NULL == key->rendered)

render_key(mc, key);

desc = key->rendered;

}

SQL_EXEC("BEGIN TRANSACTION");

i = 1;

SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, desc);

SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);

SQL_STEP(stmts[STMT_INSERT_PAGE]);

recno = sqlite3_last_insert_rowid(db);

Line 1764 dbindex(const struct mpage *mpage, struct mchars *mc)

for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {

i = 1;

SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->file);

SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec);

SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch);

SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name);

Line 1800 dbprune(void)

Line 1799 dbprune(void)

size_t i;

unsigned int slot;

if (nodb)

if (0 == nodb)

return;

SQL_EXEC("BEGIN TRANSACTION");

mpage = ohash_first(&mpages, &slot);

for (mpage = ohash_first(&mpages, &slot); NULL != mpage;

while (NULL != mpage) {

mpage = ohash_next(&mpages, &slot)) {

mlink = mpage->mlinks;

i = 1;

SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE], i, mlink->file);

SQL_STEP(stmts[STMT_DELETE_PAGE]);

sqlite3_reset(stmts[STMT_DELETE_PAGE]);

if (verb)

say(mlink->file, "Deleted from index");

say(mlink->file, "Deleting from database");

mpage = ohash_next(&mpages, &slot);

if (nodb)

continue;

for ( ; NULL != mlink; mlink = mlink->next) {

i = 1;

SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],

i, mlink->dsec);

SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],

i, mlink->arch);

SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],

i, mlink->name);

SQL_STEP(stmts[STMT_DELETE_PAGE]);

sqlite3_reset(stmts[STMT_DELETE_PAGE]);

}

if (0 == nodb)

SQL_EXEC("END TRANSACTION");

}

Line 1893 dbopen(int real)

Line 1903 dbopen(int real)

}

sql = "CREATE TABLE \"mpages\" (\n"

" \"desc\" TEXT NOT NULL,\n"

" \"form\" INTEGER NOT NULL,\n"

" \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"

");\n"

"\n"

"CREATE TABLE \"mlinks\" (\n"

" \"file\" TEXT NOT NULL,\n"

" \"sec\" TEXT NOT NULL,\n"

" \"arch\" TEXT NOT NULL,\n"

" \"name\" TEXT NOT NULL,\n"

Line 1926 dbopen(int real)

Line 1934 dbopen(int real)

prepare_statements:

SQL_EXEC("PRAGMA foreign_keys = ON");

sql = "DELETE FROM mpages where file=?";

sql = "DELETE FROM mpages WHERE id IN "

"(SELECT pageid FROM mlinks WHERE "

"sec=? AND arch=? AND name=?)";

sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);

sql = "INSERT INTO mpages "

"(desc,form) VALUES (?,?)";

"(form) VALUES (?)";

sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL);

sql = "INSERT INTO mlinks "

"(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)";

"(sec,arch,name,pageid) VALUES (?,?,?,?)";

sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);

sql = "INSERT INTO keys "

"(bits,key,pageid) VALUES (?,?,?)";

CVSweb