mandoc/mandocdb.c - diff

Return to mandocdb.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandocdb.c between version 1.201 and 1.204

version 1.201, 2015/10/12 21:17:15

version 1.204, 2015/10/20 02:01:31

Line 40

#include <string.h>

#include <unistd.h>

#if HAVE_OHASH

#include <ohash.h>

#else

#include "compat_ohash.h"

#endif

#include <sqlite3.h>

#include "mandoc_aux.h"

#include "mandoc_ohash.h"

#include "mandoc.h"

#include "roff.h"

#include "mdoc.h"

Line 146 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 void dbprune(void);

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_check(struct mpage *, struct mlink *);

static void mlink_free(struct mlink *);

Line 202 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 enum op op; /* operational mode */

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 mlinks; /* table of directory entries */

static struct ohash names; /* table of all names */

Line 342 int

Line 334 int

mandocdb(int argc, char *argv[])

{

struct manconf conf;

struct ohash_info mpages_info, mlinks_info;

struct mparse *mp;

const char *path_arg;

size_t j, sz;

Line 351 mandocdb(int argc, char *argv[])

Line 342 mandocdb(int argc, char *argv[])

memset(&conf, 0, sizeof(conf));

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);

* We accept a few different invocations.

* The CHECKOP macro makes sure that invocation styles don't

Line 435 mandocdb(int argc, char *argv[])

Line 418 mandocdb(int argc, char *argv[])

}

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) {

Line 509 mandocdb(int argc, char *argv[])

Line 491 mandocdb(int argc, char *argv[])

continue;

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))

Line 536 mandocdb(int argc, char *argv[])

Line 520 mandocdb(int argc, char *argv[])

out:

manconf_free(&conf);

mparse_free(mp);

mchars_free(mchars);

mchars_free();

mpages_free();

ohash_delete(&mpages);

ohash_delete(&mlinks);

Line 1099 static void

Line 1083 static void

mpages_merge(struct mparse *mp)

{

char any[] = "any";

struct ohash_info str_info;

struct mpage *mpage, *mpage_dest;

struct mlink *mlink, *mlink_dest;

struct roff_man *man;

Line 1108 mpages_merge(struct mparse *mp)

Line 1091 mpages_merge(struct mparse *mp)

int fd;

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)

SQL_EXEC("BEGIN TRANSACTION");

Line 1126 mpages_merge(struct mparse *mp)

Line 1103 mpages_merge(struct mparse *mp)

}

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);

man = NULL;

sodest = NULL;

Line 1189 mpages_merge(struct mparse *mp)

Line 1166 mpages_merge(struct mparse *mp)

}

goto nextpage;

} else if (man != NULL && man->macroset == MACROSET_MDOC) {

mdoc_validate(man);

mpage->form = FORM_SRC;

mpage->sec = man->meta.msec;

mpage->sec = mandoc_strdup(

Line 1949 render_string(char **public, size_t *psz)

Line 1927 render_string(char **public, size_t *psz)

if (write_utf8) {

unicode = mchars_spec2cp(mchars, seq, seqlen);

unicode = mchars_spec2cp(seq, seqlen);

if (unicode <= 0)

continue;

addsz = utf8(unicode, utfbuf);

Line 1957 render_string(char **public, size_t *psz)

Line 1935 render_string(char **public, size_t *psz)

continue;

addcp = utfbuf;

} else {

addcp = mchars_spec2str(mchars, seq, seqlen, &addsz);

addcp = mchars_spec2str(seq, seqlen, &addsz);

if (addcp == NULL)

continue;

if (*addcp == ASCII_NBRSP) {

Line 2382 prepare_statements:

Line 2360 prepare_statements:

#endif

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

CVSweb