version 1.12, 2011/11/26 11:23:56 |
version 1.13, 2011/11/26 22:38:11 |
Line 378 main(int argc, char *argv[]) |
|
Line 378 main(int argc, char *argv[]) |
|
&maxrec, &recs, &recsz); |
&maxrec, &recs, &recsz); |
|
|
if (OP_UPDATE == op) |
if (OP_UPDATE == op) |
index_merge(of, mp, &dbuf, &buf, hash, |
index_merge(of, mp, &dbuf, &buf, hash, |
db, fbuf, idx, ibuf, use_all, |
db, fbuf, idx, ibuf, use_all, |
verb, maxrec, recs, reccur); |
verb, maxrec, recs, reccur); |
|
|
Line 411 main(int argc, char *argv[]) |
|
Line 411 main(int argc, char *argv[]) |
|
sz2 = strlcat(ibuf, MANDOC_IDX, MAXPATHLEN); |
sz2 = strlcat(ibuf, MANDOC_IDX, MAXPATHLEN); |
|
|
if (sz1 >= MAXPATHLEN || sz2 >= MAXPATHLEN) { |
if (sz1 >= MAXPATHLEN || sz2 >= MAXPATHLEN) { |
fprintf(stderr, "%s: Path too long\n", |
fprintf(stderr, "%s: Path too long\n", |
dirs.paths[i]); |
dirs.paths[i]); |
exit((int)MANDOCLEVEL_BADARG); |
exit((int)MANDOCLEVEL_BADARG); |
} |
} |
|
|
|
if (db) |
|
(*db->close)(db); |
|
if (idx) |
|
(*idx->close)(idx); |
|
|
db = dbopen(fbuf, flags, 0644, DB_BTREE, &info); |
db = dbopen(fbuf, flags, 0644, DB_BTREE, &info); |
idx = dbopen(ibuf, flags, 0644, DB_RECNO, NULL); |
idx = dbopen(ibuf, flags, 0644, DB_RECNO, NULL); |
|
|
Line 444 main(int argc, char *argv[]) |
|
Line 449 main(int argc, char *argv[]) |
|
|
|
of = of->first; |
of = of->first; |
|
|
index_merge(of, mp, &dbuf, &buf, hash, db, fbuf, |
index_merge(of, mp, &dbuf, &buf, hash, db, fbuf, |
idx, ibuf, use_all, verb, |
idx, ibuf, use_all, verb, |
maxrec, recs, reccur); |
maxrec, recs, reccur); |
} |
} |
|
|
void |
void |
index_merge(const struct of *of, struct mparse *mp, |
index_merge(const struct of *of, struct mparse *mp, |
struct buf *dbuf, struct buf *buf, |
struct buf *dbuf, struct buf *buf, |
DB *hash, DB *db, const char *dbf, |
DB *hash, DB *db, const char *dbf, |
DB *idx, const char *idxf, int use_all, int verb, |
DB *idx, const char *idxf, int use_all, int verb, |
recno_t maxrec, const recno_t *recs, size_t reccur) |
recno_t maxrec, const recno_t *recs, size_t reccur) |
{ |
{ |