mandoc/mandocdb.c - diff

Return to mandocdb.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandocdb.c between version 1.8 and 1.11

version 1.8, 2011/11/13 10:49:57

version 1.11, 2011/11/24 12:54:19

Line 39

#include "mdoc.h"

#include "mandoc.h"

#include "mandocdb.h"

#include "manpath.h"

#define MANDOC_BUFSZ BUFSIZ

#define MANDOC_SLOP 1024

Line 83 static void buf_append(struct buf *, const char *);

Line 84 static void buf_append(struct buf *, const char *);

static void buf_appendb(struct buf *,

const void *, size_t);

static void dbt_put(DB *, const char *, DBT *, DBT *);

static void hash_put(DB *, const struct buf *, int);

static void hash_put(DB *, const struct buf *, uint64_t);

static void hash_reset(DB **);

static void index_merge(const struct of *, struct mparse *,

struct buf *, struct buf *,

Line 247 int

Line 248 int

main(int argc, char *argv[])

{

struct mparse *mp; /* parse sequence */

struct manpaths dirs;

enum op op; /* current operation */

const char *dir;

char ibuf[MAXPATHLEN], /* index fname */

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

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

else

++progname;

memset(&dirs, 0, sizeof(struct manpaths));

verb = 0;

of = NULL;

db = idx = NULL;

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

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

goto out;

}

for (i = 0; i < argc; i++) {

* Configure the directories we're going to scan.

* If we have command-line arguments, use them.

* If not, we use man(1)'s method (see mandocdb.8).

if (argc > 0) {

dirs.paths = mandoc_malloc(argc * sizeof(char *));

dirs.sz = argc;

for (i = 0; i < argc; i++)

dirs.paths[i] = mandoc_strdup(argv[i]);

} else

manpath_parse(&dirs, NULL, NULL);

for (i = 0; i < dirs.sz; i++) {

ibuf[0] = fbuf[0] = '\0';

strlcat(fbuf, argv[i], MAXPATHLEN);

strlcat(fbuf, dirs.paths[i], MAXPATHLEN);

strlcat(fbuf, "/", MAXPATHLEN);

sz1 = strlcat(fbuf, MANDOC_DB, MAXPATHLEN);

strlcat(ibuf, argv[i], MAXPATHLEN);

strlcat(ibuf, dirs.paths[i], MAXPATHLEN);

strlcat(ibuf, "/", MAXPATHLEN);

sz2 = strlcat(ibuf, MANDOC_IDX, MAXPATHLEN);

if (sz1 >= MAXPATHLEN || sz2 >= MAXPATHLEN) {

fprintf(stderr, "%s: Path too long\n", argv[i]);

fprintf(stderr, "%s: Path too long\n",

dirs.paths[i]);

exit((int)MANDOCLEVEL_BADARG);

}

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

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

ofile_free(of);

of = NULL;

if ( ! ofile_dirbuild(argv[i], verb, &of))

if ( ! ofile_dirbuild(dirs.paths[i], verb, &of))

exit((int)MANDOCLEVEL_SYSERR);

if (NULL == of)

Line 427 out:

Line 446 out:

if (mp)

mparse_free(mp);

manpath_free(&dirs);

ofile_free(of);

free(buf.cp);

free(dbuf.cp);

Line 450 index_merge(const struct of *of, struct mparse *mp,

Line 470 index_merge(const struct of *of, struct mparse *mp,

const char *fn, *msec, *mtitle, *arch;

size_t sv;

unsigned seq;

char vbuf[8];

struct db_val vbuf;

for (rec = 0; of; of = of->next) {

fn = of->fname;

Line 513 index_merge(const struct of *of, struct mparse *mp,

Line 533 index_merge(const struct of *of, struct mparse *mp,

* Copy from the in-memory hashtable of pending keywords

* into the database.

memset(vbuf, 0, sizeof(uint32_t));

memcpy(vbuf + 4, &rec, sizeof(uint32_t));

vbuf.rec = rec;

seq = R_FIRST;

while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) {

seq = R_NEXT;

memcpy(vbuf, val.data, sizeof(uint32_t));

vbuf.mask = *(uint64_t *)val.data;

val.size = sizeof(vbuf);

val.size = sizeof(struct db_val);

val.data = vbuf;

val.data = &vbuf;

if (verb > 1)

printf("%s: Added keyword: %s\n",

Line 568 index_prune(const struct of *ofile, DB *db, const char

Line 586 index_prune(const struct of *ofile, DB *db, const char

{

const struct of *of;

const char *fn;

struct db_val *vbuf;

unsigned seq, sseq;

DBT key, val;

size_t reccur;

Line 600 index_prune(const struct of *ofile, DB *db, const char

Line 619 index_prune(const struct of *ofile, DB *db, const char

sseq = R_FIRST;

while (0 == (ch = (*db->seq)(db, &key, &val, sseq))) {

sseq = R_NEXT;

assert(8 == val.size);

assert(sizeof(struct db_val) == val.size);

if (*maxrec != *(recno_t *)(val.data + 4))

vbuf = val.data;

if (*maxrec != vbuf->rec)

continue;

if (verb)

printf("%s: Deleted keyword: %s\n",

Line 982 pmdoc_Nm(MDOC_ARGS)

Line 1002 pmdoc_Nm(MDOC_ARGS)

}

static void

hash_put(DB *db, const struct buf *buf, int mask)

hash_put(DB *db, const struct buf *buf, uint64_t mask)

{

DBT key, val;

int rc;

Line 997 hash_put(DB *db, const struct buf *buf, int mask)

Line 1017 hash_put(DB *db, const struct buf *buf, int mask)

perror("hash");

exit((int)MANDOCLEVEL_SYSERR);

} else if (0 == rc)

mask |= *(int *)val.data;

mask |= *(uint64_t *)val.data;

val.data = &mask;

val.size = sizeof(int);

val.size = sizeof(uint64_t);

if ((rc = (*db->put)(db, &key, &val, 0)) < 0) {

perror("hash");

CVSweb