version 1.26, 2011/12/08 01:00:58 |
version 1.38, 2011/12/25 13:08:12 |
|
|
|
|
#include <sys/param.h> |
#include <sys/param.h> |
#include <sys/types.h> |
#include <sys/types.h> |
#include <sys/stat.h> |
|
|
|
#include <assert.h> |
#include <assert.h> |
#include <dirent.h> |
#include <dirent.h> |
|
|
#define MANDOC_SRC 0x1 |
#define MANDOC_SRC 0x1 |
#define MANDOC_FORM 0x2 |
#define MANDOC_FORM 0x2 |
|
|
|
/* Access to the mandoc database on disk. */ |
|
|
|
struct mdb { |
|
char idxn[MAXPATHLEN]; /* index db filename */ |
|
char dbn[MAXPATHLEN]; /* keyword db filename */ |
|
DB *idx; /* index recno database */ |
|
DB *db; /* keyword btree database */ |
|
}; |
|
|
|
/* Stack of temporarily unused index records. */ |
|
|
|
struct recs { |
|
recno_t *stack; /* pointer to a malloc'ed array */ |
|
size_t size; /* number of allocated slots */ |
|
size_t cur; /* current number of empty records */ |
|
recno_t last; /* last record number in the index */ |
|
}; |
|
|
/* Tiny list for files. No need to bring in QUEUE. */ |
/* Tiny list for files. No need to bring in QUEUE. */ |
|
|
struct of { |
struct of { |
|
|
/* Operation we're going to perform. */ |
/* Operation we're going to perform. */ |
|
|
enum op { |
enum op { |
OP_NEW = 0, /* new database */ |
OP_DEFAULT = 0, /* new dbs from dir list or default config */ |
|
OP_CONFFILE, /* new databases from custom config file */ |
OP_UPDATE, /* delete/add entries in existing database */ |
OP_UPDATE, /* delete/add entries in existing database */ |
OP_DELETE /* delete entries from existing database */ |
OP_DELETE, /* delete entries from existing database */ |
|
OP_TEST /* change no databases, report potential problems */ |
}; |
}; |
|
|
#define MAN_ARGS DB *hash, \ |
#define MAN_ARGS DB *hash, \ |
Line 103 static void hash_put(DB *, const struct buf *, uint |
|
Line 122 static void hash_put(DB *, const struct buf *, uint |
|
static void hash_reset(DB **); |
static void hash_reset(DB **); |
static void index_merge(const struct of *, struct mparse *, |
static void index_merge(const struct of *, struct mparse *, |
struct buf *, struct buf *, DB *, |
struct buf *, struct buf *, DB *, |
DB *, const char *, DB *, const char *, |
struct mdb *, struct recs *); |
recno_t, const recno_t *, size_t); |
static void index_prune(const struct of *, struct mdb *, |
static void index_prune(const struct of *, DB *, |
struct recs *); |
const char *, DB *, const char *, |
|
recno_t *, recno_t **, size_t *); |
|
static void ofile_argbuild(int, char *[], struct of **); |
static void ofile_argbuild(int, char *[], struct of **); |
static int ofile_dirbuild(const char *, const char *, |
static void ofile_dirbuild(const char *, const char *, |
const char *, int, struct of **); |
const char *, int, struct of **); |
static void ofile_free(struct of *); |
static void ofile_free(struct of *); |
static void pformatted(DB *, struct buf *, struct buf *, |
static void pformatted(DB *, struct buf *, struct buf *, |
Line 126 static int pmdoc_Nm(MDOC_ARGS); |
|
Line 143 static int pmdoc_Nm(MDOC_ARGS); |
|
static int pmdoc_Sh(MDOC_ARGS); |
static int pmdoc_Sh(MDOC_ARGS); |
static int pmdoc_St(MDOC_ARGS); |
static int pmdoc_St(MDOC_ARGS); |
static int pmdoc_Xr(MDOC_ARGS); |
static int pmdoc_Xr(MDOC_ARGS); |
static void usage(void); |
|
|
|
#define MDOCF_CHILD 0x01 /* Automatically index child nodes. */ |
#define MDOCF_CHILD 0x01 /* Automatically index child nodes. */ |
|
|
Line 264 static const struct mdoc_handler mdocs[MDOC_MAX] = { |
|
Line 280 static const struct mdoc_handler mdocs[MDOC_MAX] = { |
|
static const char *progname; |
static const char *progname; |
static int use_all; /* Use all directories and files. */ |
static int use_all; /* Use all directories and files. */ |
static int verb; /* Output verbosity level. */ |
static int verb; /* Output verbosity level. */ |
|
static int warnings; /* Potential problems in manuals. */ |
|
|
int |
int |
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
{ |
{ |
struct mparse *mp; /* parse sequence */ |
struct mparse *mp; /* parse sequence */ |
struct manpaths dirs; |
struct manpaths dirs; |
|
struct mdb mdb; |
|
struct recs recs; |
enum op op; /* current operation */ |
enum op op; /* current operation */ |
const char *dir; |
const char *dir; |
char *cp; |
char *cp; |
char pbuf[PATH_MAX], |
char pbuf[PATH_MAX]; |
ibuf[MAXPATHLEN], /* index fname */ |
|
fbuf[MAXPATHLEN]; /* btree fname */ |
|
int ch, i, flags; |
int ch, i, flags; |
DB *idx, /* index database */ |
DB *hash; /* temporary keyword hashtable */ |
*db, /* keyword database */ |
|
*hash; /* temporary keyword hashtable */ |
|
BTREEINFO info; /* btree configuration */ |
BTREEINFO info; /* btree configuration */ |
recno_t maxrec; /* last record number in the index */ |
size_t sz1, sz2; |
recno_t *recs; /* the numbers of all empty records */ |
|
size_t sz1, sz2, |
|
recsz, /* number of allocated slots in recs */ |
|
reccur; /* current number of empty records */ |
|
struct buf buf, /* keyword buffer */ |
struct buf buf, /* keyword buffer */ |
dbuf; /* description buffer */ |
dbuf; /* description buffer */ |
struct of *of; /* list of files for processing */ |
struct of *of; /* list of files for processing */ |
Line 299 main(int argc, char *argv[]) |
|
Line 310 main(int argc, char *argv[]) |
|
++progname; |
++progname; |
|
|
memset(&dirs, 0, sizeof(struct manpaths)); |
memset(&dirs, 0, sizeof(struct manpaths)); |
|
memset(&mdb, 0, sizeof(struct mdb)); |
|
memset(&recs, 0, sizeof(struct recs)); |
|
|
verb = 0; |
|
use_all = 0; |
|
of = NULL; |
of = NULL; |
db = idx = NULL; |
|
mp = NULL; |
mp = NULL; |
hash = NULL; |
hash = NULL; |
recs = NULL; |
op = OP_DEFAULT; |
recsz = reccur = 0; |
|
maxrec = 0; |
|
op = OP_NEW; |
|
dir = NULL; |
dir = NULL; |
|
|
while (-1 != (ch = getopt(argc, argv, "ad:u:v"))) |
while (-1 != (ch = getopt(argc, argv, "aC:d:tu:vW"))) |
switch (ch) { |
switch (ch) { |
case ('a'): |
case ('a'): |
use_all = 1; |
use_all = 1; |
break; |
break; |
|
case ('C'): |
|
if (op) { |
|
fprintf(stderr, |
|
"-C: conflicting options\n"); |
|
goto usage; |
|
} |
|
dir = optarg; |
|
op = OP_CONFFILE; |
|
break; |
case ('d'): |
case ('d'): |
|
if (op) { |
|
fprintf(stderr, |
|
"-d: conflicting options\n"); |
|
goto usage; |
|
} |
dir = optarg; |
dir = optarg; |
op = OP_UPDATE; |
op = OP_UPDATE; |
break; |
break; |
|
case ('t'): |
|
dup2(STDOUT_FILENO, STDERR_FILENO); |
|
if (op) { |
|
fprintf(stderr, |
|
"-t: conflicting options\n"); |
|
goto usage; |
|
} |
|
op = OP_TEST; |
|
use_all = 1; |
|
warnings = 1; |
|
break; |
case ('u'): |
case ('u'): |
|
if (op) { |
|
fprintf(stderr, |
|
"-u: conflicting options\n"); |
|
goto usage; |
|
} |
dir = optarg; |
dir = optarg; |
op = OP_DELETE; |
op = OP_DELETE; |
break; |
break; |
case ('v'): |
case ('v'): |
verb++; |
verb++; |
break; |
break; |
|
case ('W'): |
|
warnings = 1; |
|
break; |
default: |
default: |
usage(); |
goto usage; |
return((int)MANDOCLEVEL_BADARG); |
|
} |
} |
|
|
argc -= optind; |
argc -= optind; |
argv += optind; |
argv += optind; |
|
|
|
if (OP_CONFFILE == op && argc > 0) { |
|
fprintf(stderr, "-C: too many arguments\n"); |
|
goto usage; |
|
} |
|
|
memset(&info, 0, sizeof(BTREEINFO)); |
memset(&info, 0, sizeof(BTREEINFO)); |
info.flags = R_DUP; |
info.flags = R_DUP; |
|
|
Line 349 main(int argc, char *argv[]) |
|
Line 393 main(int argc, char *argv[]) |
|
buf.cp = mandoc_malloc(buf.size); |
buf.cp = mandoc_malloc(buf.size); |
dbuf.cp = mandoc_malloc(dbuf.size); |
dbuf.cp = mandoc_malloc(dbuf.size); |
|
|
flags = OP_NEW == op ? O_CREAT|O_TRUNC|O_RDWR : O_CREAT|O_RDWR; |
flags = O_CREAT | O_RDWR; |
|
if (OP_DEFAULT == op || OP_CONFFILE == op) |
|
flags |= O_TRUNC; |
|
|
|
if (OP_TEST == op) { |
|
ofile_argbuild(argc, argv, &of); |
|
if (NULL == of) |
|
goto out; |
|
index_merge(of, mp, &dbuf, &buf, hash, &mdb, &recs); |
|
goto out; |
|
} |
|
|
if (OP_UPDATE == op || OP_DELETE == op) { |
if (OP_UPDATE == op || OP_DELETE == op) { |
ibuf[0] = fbuf[0] = '\0'; |
strlcat(mdb.dbn, dir, MAXPATHLEN); |
|
strlcat(mdb.dbn, "/", MAXPATHLEN); |
|
sz1 = strlcat(mdb.dbn, MANDOC_DB, MAXPATHLEN); |
|
|
strlcat(fbuf, dir, MAXPATHLEN); |
strlcat(mdb.idxn, dir, MAXPATHLEN); |
strlcat(fbuf, "/", MAXPATHLEN); |
strlcat(mdb.idxn, "/", MAXPATHLEN); |
sz1 = strlcat(fbuf, MANDOC_DB, MAXPATHLEN); |
sz2 = strlcat(mdb.idxn, MANDOC_IDX, MAXPATHLEN); |
|
|
strlcat(ibuf, dir, MAXPATHLEN); |
|
strlcat(ibuf, "/", MAXPATHLEN); |
|
sz2 = strlcat(ibuf, MANDOC_IDX, MAXPATHLEN); |
|
|
|
if (sz1 >= MAXPATHLEN || sz2 >= MAXPATHLEN) { |
if (sz1 >= MAXPATHLEN || sz2 >= MAXPATHLEN) { |
fprintf(stderr, "%s: Path too long\n", dir); |
fprintf(stderr, "%s: path too long\n", dir); |
exit((int)MANDOCLEVEL_BADARG); |
exit((int)MANDOCLEVEL_BADARG); |
} |
} |
|
|
db = dbopen(fbuf, flags, 0644, DB_BTREE, &info); |
mdb.db = dbopen(mdb.dbn, flags, 0644, DB_BTREE, &info); |
idx = dbopen(ibuf, flags, 0644, DB_RECNO, NULL); |
mdb.idx = dbopen(mdb.idxn, flags, 0644, DB_RECNO, NULL); |
|
|
if (NULL == db) { |
if (NULL == mdb.db) { |
perror(fbuf); |
perror(mdb.dbn); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} else if (NULL == idx) { |
} else if (NULL == mdb.idx) { |
perror(ibuf); |
perror(mdb.idxn); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
|
|
if (verb > 2) { |
|
printf("%s: Opened\n", fbuf); |
|
printf("%s: Opened\n", ibuf); |
|
} |
|
|
|
ofile_argbuild(argc, argv, &of); |
ofile_argbuild(argc, argv, &of); |
|
|
if (NULL == of) |
if (NULL == of) |
goto out; |
goto out; |
|
|
of = of->first; |
index_prune(of, &mdb, &recs); |
|
|
index_prune(of, db, fbuf, idx, ibuf, |
|
&maxrec, &recs, &recsz); |
|
|
|
/* |
/* |
* Go to the root of the respective manual tree |
* Go to the root of the respective manual tree. |
* such that .so links work. In case of failure, |
* This must work or no manuals may be found (they're |
* just prod on, even though .so links won't work. |
* indexed relative to the root). |
*/ |
*/ |
|
|
if (OP_UPDATE == op) { |
if (OP_UPDATE == op) { |
chdir(dir); |
if (-1 == chdir(dir)) { |
|
perror(dir); |
|
exit((int)MANDOCLEVEL_SYSERR); |
|
} |
index_merge(of, mp, &dbuf, &buf, hash, |
index_merge(of, mp, &dbuf, &buf, hash, |
db, fbuf, idx, ibuf, |
&mdb, &recs); |
maxrec, recs, reccur); |
|
} |
} |
|
|
goto out; |
goto out; |
Line 425 main(int argc, char *argv[]) |
|
Line 472 main(int argc, char *argv[]) |
|
dirs.paths[i] = mandoc_strdup(cp); |
dirs.paths[i] = mandoc_strdup(cp); |
} |
} |
} else |
} else |
manpath_parse(&dirs, NULL, NULL); |
manpath_parse(&dirs, dir, NULL, NULL); |
|
|
for (i = 0; i < dirs.sz; i++) { |
for (i = 0; i < dirs.sz; i++) { |
ibuf[0] = fbuf[0] = '\0'; |
mdb.idxn[0] = mdb.dbn[0] = '\0'; |
|
|
strlcat(fbuf, dirs.paths[i], MAXPATHLEN); |
strlcat(mdb.dbn, dirs.paths[i], MAXPATHLEN); |
strlcat(fbuf, "/", MAXPATHLEN); |
strlcat(mdb.dbn, "/", MAXPATHLEN); |
sz1 = strlcat(fbuf, MANDOC_DB, MAXPATHLEN); |
sz1 = strlcat(mdb.dbn, MANDOC_DB, MAXPATHLEN); |
|
|
strlcat(ibuf, dirs.paths[i], MAXPATHLEN); |
strlcat(mdb.idxn, dirs.paths[i], MAXPATHLEN); |
strlcat(ibuf, "/", MAXPATHLEN); |
strlcat(mdb.idxn, "/", MAXPATHLEN); |
sz2 = strlcat(ibuf, MANDOC_IDX, MAXPATHLEN); |
sz2 = strlcat(mdb.idxn, 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) |
if (mdb.db) |
(*db->close)(db); |
(*mdb.db->close)(mdb.db); |
if (idx) |
if (mdb.idx) |
(*idx->close)(idx); |
(*mdb.idx->close)(mdb.idx); |
|
|
db = dbopen(fbuf, flags, 0644, DB_BTREE, &info); |
mdb.db = dbopen(mdb.dbn, flags, 0644, DB_BTREE, &info); |
idx = dbopen(ibuf, flags, 0644, DB_RECNO, NULL); |
mdb.idx = dbopen(mdb.idxn, flags, 0644, DB_RECNO, NULL); |
|
|
if (NULL == db) { |
if (NULL == mdb.db) { |
perror(fbuf); |
perror(mdb.dbn); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} else if (NULL == idx) { |
} else if (NULL == mdb.idx) { |
perror(ibuf); |
perror(mdb.idxn); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
|
|
if (verb > 2) { |
|
printf("%s: Truncated\n", fbuf); |
|
printf("%s: Truncated\n", ibuf); |
|
} |
|
|
|
ofile_free(of); |
ofile_free(of); |
of = NULL; |
of = NULL; |
|
|
if ( ! ofile_dirbuild(dirs.paths[i], NULL, NULL, |
if (-1 == chdir(dirs.paths[i])) { |
0, &of)) |
perror(dirs.paths[i]); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
|
} |
|
|
|
ofile_dirbuild(".", "", "", 0, &of); |
if (NULL == of) |
if (NULL == of) |
continue; |
continue; |
|
|
of = of->first; |
|
|
|
/* |
/* |
* Go to the root of the respective manual tree |
* Go to the root of the respective manual tree. |
* such that .so links work. In case of failure, |
* This must work or no manuals may be found (they're |
* just prod on, even though .so links won't work. |
* indexed relative to the root). |
*/ |
*/ |
|
|
chdir(dirs.paths[i]); |
if (-1 == chdir(dirs.paths[i])) { |
index_merge(of, mp, &dbuf, &buf, hash, db, fbuf, |
perror(dirs.paths[i]); |
idx, ibuf, maxrec, recs, reccur); |
exit((int)MANDOCLEVEL_SYSERR); |
|
} |
|
|
|
index_merge(of, mp, &dbuf, &buf, hash, &mdb, &recs); |
} |
} |
|
|
out: |
out: |
if (db) |
if (mdb.db) |
(*db->close)(db); |
(*mdb.db->close)(mdb.db); |
if (idx) |
if (mdb.idx) |
(*idx->close)(idx); |
(*mdb.idx->close)(mdb.idx); |
if (hash) |
if (hash) |
(*hash->close)(hash); |
(*hash->close)(hash); |
if (mp) |
if (mp) |
|
|
ofile_free(of); |
ofile_free(of); |
free(buf.cp); |
free(buf.cp); |
free(dbuf.cp); |
free(dbuf.cp); |
free(recs); |
free(recs.stack); |
|
|
return(MANDOCLEVEL_OK); |
return(MANDOCLEVEL_OK); |
|
|
|
usage: |
|
fprintf(stderr, |
|
"usage: %s [-avvv] [-C file] | dir ... | -t file ...\n" |
|
" -d dir [file ...] | " |
|
"-u dir [file ...]\n", |
|
progname); |
|
|
|
return((int)MANDOCLEVEL_BADARG); |
} |
} |
|
|
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, DB *hash, |
struct buf *dbuf, struct buf *buf, DB *hash, |
DB *db, const char *dbf, DB *idx, const char *idxf, |
struct mdb *mdb, struct recs *recs) |
recno_t maxrec, const recno_t *recs, size_t reccur) |
|
{ |
{ |
recno_t rec; |
recno_t rec; |
int ch; |
int ch, skip; |
DBT key, val; |
DBT key, val; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct man *man; |
struct man *man; |
const char *fn, *msec, *mtitle, *arch; |
const char *fn, *msec, *march, *mtitle; |
|
uint64_t mask; |
size_t sv; |
size_t sv; |
unsigned seq; |
unsigned seq; |
struct db_val vbuf; |
struct db_val vbuf; |
|
char type; |
|
|
for (rec = 0; of; of = of->next) { |
rec = 0; |
|
for (of = of->first; of; of = of->next) { |
fn = of->fname; |
fn = of->fname; |
|
|
/* |
/* |
* Reclaim an empty index record, if available. |
* Try interpreting the file as mdoc(7) or man(7) |
|
* source code, unless it is already known to be |
|
* formatted. Fall back to formatted mode. |
*/ |
*/ |
|
|
if (reccur > 0) { |
|
--reccur; |
|
rec = recs[(int)reccur]; |
|
} else if (maxrec > 0) { |
|
rec = maxrec; |
|
maxrec = 0; |
|
} else |
|
rec++; |
|
|
|
mparse_reset(mp); |
mparse_reset(mp); |
hash_reset(&hash); |
|
mdoc = NULL; |
mdoc = NULL; |
man = NULL; |
man = NULL; |
|
|
/* |
|
* Try interpreting the file as mdoc(7) or man(7) |
|
* source code, unless it is already known to be |
|
* formatted. Fall back to formatted mode. |
|
*/ |
|
|
|
if ((MANDOC_SRC & of->src_form || |
if ((MANDOC_SRC & of->src_form || |
! (MANDOC_FORM & of->src_form)) && |
! (MANDOC_FORM & of->src_form)) && |
MANDOCLEVEL_FATAL > mparse_readfd(mp, -1, fn)) |
MANDOCLEVEL_FATAL > mparse_readfd(mp, -1, fn)) |
Line 557 index_merge(const struct of *of, struct mparse *mp, |
|
Line 599 index_merge(const struct of *of, struct mparse *mp, |
|
|
|
if (NULL != mdoc) { |
if (NULL != mdoc) { |
msec = mdoc_meta(mdoc)->msec; |
msec = mdoc_meta(mdoc)->msec; |
arch = mdoc_meta(mdoc)->arch; |
march = mdoc_meta(mdoc)->arch; |
|
if (NULL == march) |
|
march = ""; |
mtitle = mdoc_meta(mdoc)->title; |
mtitle = mdoc_meta(mdoc)->title; |
} else if (NULL != man) { |
} else if (NULL != man) { |
msec = man_meta(man)->msec; |
msec = man_meta(man)->msec; |
arch = NULL; |
march = ""; |
mtitle = man_meta(man)->title; |
mtitle = man_meta(man)->title; |
} else { |
} else { |
msec = of->sec; |
msec = of->sec; |
arch = of->arch; |
march = of->arch; |
mtitle = of->title; |
mtitle = of->title; |
} |
} |
|
|
Line 575 index_merge(const struct of *of, struct mparse *mp, |
|
Line 619 index_merge(const struct of *of, struct mparse *mp, |
|
* with the directory where the file is located. |
* with the directory where the file is located. |
*/ |
*/ |
|
|
if (0 == use_all) { |
skip = 0; |
assert(of->sec); |
assert(of->sec); |
assert(msec); |
assert(msec); |
if (strcmp(msec, of->sec)) |
if (strcasecmp(msec, of->sec)) { |
continue; |
if (warnings) |
|
fprintf(stderr, "%s: " |
|
"section \"%s\" manual " |
|
"in \"%s\" directory\n", |
|
fn, msec, of->sec); |
|
skip = 1; |
|
} |
|
|
if (NULL == arch) { |
assert(of->arch); |
if (NULL != of->arch) |
assert(march); |
continue; |
if (strcasecmp(march, of->arch)) { |
} else if (NULL == of->arch || |
if (warnings) |
strcmp(arch, of->arch)) |
fprintf(stderr, "%s: " |
continue; |
"architecture \"%s\" manual " |
|
"in \"%s\" directory\n", |
|
fn, march, of->arch); |
|
skip = 1; |
} |
} |
|
|
if (NULL == arch) |
/* |
arch = ""; |
|
|
|
/* |
|
* By default, skip a file if the title given |
* By default, skip a file if the title given |
* in the file disagrees with the file name. |
* in the file disagrees with the file name. |
* If both agree, use the file name as the title, |
* If both agree, use the file name as the title, |
Line 601 index_merge(const struct of *of, struct mparse *mp, |
|
Line 651 index_merge(const struct of *of, struct mparse *mp, |
|
|
|
assert(of->title); |
assert(of->title); |
assert(mtitle); |
assert(mtitle); |
|
if (strcasecmp(mtitle, of->title)) { |
if (0 == strcasecmp(mtitle, of->title)) |
if (warnings) |
|
fprintf(stderr, "%s: " |
|
"title \"%s\" in file " |
|
"but \"%s\" in filename\n", |
|
fn, mtitle, of->title); |
|
skip = 1; |
|
} else |
mtitle = of->title; |
mtitle = of->title; |
else if (0 == use_all) |
|
|
if (skip && !use_all) |
continue; |
continue; |
|
|
/* |
/* |
* The index record value consists of a nil-terminated |
* The index record value consists of a nil-terminated |
* filename, a nil-terminated manual section, and a |
* filename, a nil-terminated manual section, and a |
* nil-terminated description. Since the description |
* nil-terminated description. Since the description |
Line 616 index_merge(const struct of *of, struct mparse *mp, |
|
Line 673 index_merge(const struct of *of, struct mparse *mp, |
|
*/ |
*/ |
|
|
dbuf->len = 0; |
dbuf->len = 0; |
buf_append(dbuf, mdoc ? "mdoc" : (man ? "man" : "cat")); |
type = mdoc ? 'd' : (man ? 'a' : 'c'); |
|
buf_appendb(dbuf, &type, 1); |
buf_appendb(dbuf, fn, strlen(fn) + 1); |
buf_appendb(dbuf, fn, strlen(fn) + 1); |
buf_appendb(dbuf, msec, strlen(msec) + 1); |
buf_appendb(dbuf, msec, strlen(msec) + 1); |
buf_appendb(dbuf, mtitle, strlen(mtitle) + 1); |
buf_appendb(dbuf, mtitle, strlen(mtitle) + 1); |
buf_appendb(dbuf, arch, strlen(arch) + 1); |
buf_appendb(dbuf, march, strlen(march) + 1); |
|
|
sv = dbuf->len; |
sv = dbuf->len; |
|
|
/* Fix the record number in the btree value. */ |
/* |
|
* Collect keyword/mask pairs. |
|
* Each pair will become a new btree node. |
|
*/ |
|
|
|
hash_reset(&hash); |
if (mdoc) |
if (mdoc) |
pmdoc_node(hash, buf, dbuf, |
pmdoc_node(hash, buf, dbuf, |
mdoc_node(mdoc), mdoc_meta(mdoc)); |
mdoc_node(mdoc), mdoc_meta(mdoc)); |
Line 634 index_merge(const struct of *of, struct mparse *mp, |
|
Line 696 index_merge(const struct of *of, struct mparse *mp, |
|
else |
else |
pformatted(hash, buf, dbuf, of); |
pformatted(hash, buf, dbuf, of); |
|
|
|
/* Test mode, do not access any database. */ |
|
|
|
if (NULL == mdb->db || NULL == mdb->idx) |
|
continue; |
|
|
/* |
/* |
* Copy from the in-memory hashtable of pending keywords |
* Reclaim an empty index record, if available. |
* into the database. |
* Use its record number for all new btree nodes. |
*/ |
*/ |
|
|
|
if (recs->cur > 0) { |
|
recs->cur--; |
|
rec = recs->stack[(int)recs->cur]; |
|
} else if (recs->last > 0) { |
|
rec = recs->last; |
|
recs->last = 0; |
|
} else |
|
rec++; |
vbuf.rec = htobe32(rec); |
vbuf.rec = htobe32(rec); |
|
|
|
/* |
|
* Copy from the in-memory hashtable of pending |
|
* keyword/mask pairs into the database. |
|
*/ |
|
|
seq = R_FIRST; |
seq = R_FIRST; |
while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) { |
while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) { |
seq = R_NEXT; |
seq = R_NEXT; |
vbuf.mask = htobe64(*(uint64_t *)val.data); |
assert(sizeof(uint64_t) == val.size); |
|
memcpy(&mask, val.data, val.size); |
|
vbuf.mask = htobe64(mask); |
val.size = sizeof(struct db_val); |
val.size = sizeof(struct db_val); |
val.data = &vbuf; |
val.data = &vbuf; |
dbt_put(db, dbf, &key, &val); |
dbt_put(mdb->db, mdb->dbn, &key, &val); |
} |
} |
if (ch < 0) { |
if (ch < 0) { |
perror("hash"); |
perror("hash"); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
|
|
/* |
/* |
* Apply to the index. If we haven't had a description |
* Apply to the index. If we haven't had a description |
* set, put an empty one in now. |
* set, put an empty one in now. |
Line 668 index_merge(const struct of *of, struct mparse *mp, |
|
Line 751 index_merge(const struct of *of, struct mparse *mp, |
|
val.size = dbuf->len; |
val.size = dbuf->len; |
|
|
if (verb) |
if (verb) |
printf("%s: Added index\n", fn); |
printf("%s: adding to index\n", fn); |
|
|
dbt_put(idx, idxf, &key, &val); |
dbt_put(mdb->idx, mdb->idxn, &key, &val); |
} |
} |
} |
} |
|
|
Line 681 index_merge(const struct of *of, struct mparse *mp, |
|
Line 764 index_merge(const struct of *of, struct mparse *mp, |
|
* in `idx' (zeroing its value size). |
* in `idx' (zeroing its value size). |
*/ |
*/ |
static void |
static void |
index_prune(const struct of *ofile, DB *db, const char *dbf, |
index_prune(const struct of *ofile, struct mdb *mdb, struct recs *recs) |
DB *idx, const char *idxf, |
|
recno_t *maxrec, recno_t **recs, size_t *recsz) |
|
{ |
{ |
const struct of *of; |
const struct of *of; |
const char *fn, *cp; |
const char *fn; |
struct db_val *vbuf; |
struct db_val *vbuf; |
unsigned seq, sseq; |
unsigned seq, sseq; |
DBT key, val; |
DBT key, val; |
size_t reccur; |
|
int ch; |
int ch; |
|
|
reccur = 0; |
recs->cur = 0; |
seq = R_FIRST; |
seq = R_FIRST; |
while (0 == (ch = (*idx->seq)(idx, &key, &val, seq))) { |
while (0 == (ch = (*mdb->idx->seq)(mdb->idx, &key, &val, seq))) { |
seq = R_NEXT; |
seq = R_NEXT; |
*maxrec = *(recno_t *)key.data; |
assert(sizeof(recno_t) == key.size); |
cp = val.data; |
memcpy(&recs->last, key.data, key.size); |
|
|
/* Deleted records are zero-sized. Skip them. */ |
/* Deleted records are zero-sized. Skip them. */ |
|
|
Line 712 index_prune(const struct of *ofile, DB *db, const char |
|
Line 792 index_prune(const struct of *ofile, DB *db, const char |
|
* Failing any of these, we go into our error handler. |
* Failing any of these, we go into our error handler. |
*/ |
*/ |
|
|
if (NULL == (fn = memchr(cp, '\0', val.size))) |
fn = (char *)val.data + 1; |
|
if (NULL == memchr(fn, '\0', val.size - 1)) |
break; |
break; |
if (++fn - cp >= (int)val.size) |
|
break; |
|
if (NULL == memchr(fn, '\0', val.size - (fn - cp))) |
|
break; |
|
|
|
/* |
/* |
* Search for the file in those we care about. |
* Search for the file in those we care about. |
* XXX: build this into a tree. Too slow. |
* XXX: build this into a tree. Too slow. |
*/ |
*/ |
|
|
for (of = ofile; of; of = of->next) |
for (of = ofile->first; of; of = of->next) |
if (0 == strcmp(fn, of->fname)) |
if (0 == strcmp(fn, of->fname)) |
break; |
break; |
|
|
Line 737 index_prune(const struct of *ofile, DB *db, const char |
|
Line 814 index_prune(const struct of *ofile, DB *db, const char |
|
*/ |
*/ |
|
|
sseq = R_FIRST; |
sseq = R_FIRST; |
while (0 == (ch = (*db->seq)(db, &key, &val, sseq))) { |
while (0 == (ch = (*mdb->db->seq)(mdb->db, |
|
&key, &val, sseq))) { |
sseq = R_NEXT; |
sseq = R_NEXT; |
if (sizeof(struct db_val) != val.size) |
if (sizeof(struct db_val) != val.size) |
break; |
break; |
|
|
vbuf = val.data; |
vbuf = val.data; |
if (*maxrec != betoh32(vbuf->rec)) |
if (recs->last != betoh32(vbuf->rec)) |
continue; |
continue; |
|
|
if ((ch = (*db->del)(db, &key, R_CURSOR)) < 0) |
if ((ch = (*mdb->db->del)(mdb->db, |
|
&key, R_CURSOR)) < 0) |
break; |
break; |
} |
} |
|
|
if (ch < 0) { |
if (ch < 0) { |
perror(dbf); |
perror(mdb->dbn); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} else if (1 != ch) { |
} else if (1 != ch) { |
fprintf(stderr, "%s: Corrupt database\n", dbf); |
fprintf(stderr, "%s: corrupt database\n", |
|
mdb->dbn); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
|
|
if (verb) |
if (verb) |
printf("%s: Deleted index\n", fn); |
printf("%s: deleting from index\n", fn); |
|
|
val.size = 0; |
val.size = 0; |
ch = (*idx->put)(idx, &key, &val, R_CURSOR); |
ch = (*mdb->idx->put)(mdb->idx, &key, &val, R_CURSOR); |
|
|
if (ch < 0) |
if (ch < 0) |
break; |
break; |
cont: |
cont: |
if (reccur >= *recsz) { |
if (recs->cur >= recs->size) { |
*recsz += MANDOC_SLOP; |
recs->size += MANDOC_SLOP; |
*recs = mandoc_realloc |
recs->stack = mandoc_realloc(recs->stack, |
(*recs, *recsz * sizeof(recno_t)); |
recs->size * sizeof(recno_t)); |
} |
} |
|
|
(*recs)[(int)reccur] = *maxrec; |
recs->stack[(int)recs->cur] = recs->last; |
reccur++; |
recs->cur++; |
} |
} |
|
|
if (ch < 0) { |
if (ch < 0) { |
perror(idxf); |
perror(mdb->idxn); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} else if (1 != ch) { |
} else if (1 != ch) { |
fprintf(stderr, "%s: Corrupt index\n", idxf); |
fprintf(stderr, "%s: corrupt index\n", mdb->idxn); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
|
|
(*maxrec)++; |
recs->last++; |
} |
} |
|
|
/* |
/* |
Line 1061 pmdoc_Sh(MDOC_ARGS) |
|
Line 1141 pmdoc_Sh(MDOC_ARGS) |
|
static void |
static void |
hash_put(DB *db, const struct buf *buf, uint64_t mask) |
hash_put(DB *db, const struct buf *buf, uint64_t mask) |
{ |
{ |
|
uint64_t oldmask; |
DBT key, val; |
DBT key, val; |
int rc; |
int rc; |
|
|
Line 1073 hash_put(DB *db, const struct buf *buf, uint64_t mask) |
|
Line 1154 hash_put(DB *db, const struct buf *buf, uint64_t mask) |
|
if ((rc = (*db->get)(db, &key, &val, 0)) < 0) { |
if ((rc = (*db->get)(db, &key, &val, 0)) < 0) { |
perror("hash"); |
perror("hash"); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} else if (0 == rc) |
} else if (0 == rc) { |
mask |= *(uint64_t *)val.data; |
assert(sizeof(uint64_t) == val.size); |
|
memcpy(&oldmask, val.data, val.size); |
|
mask |= oldmask; |
|
} |
|
|
val.data = &mask; |
val.data = &mask; |
val.size = sizeof(uint64_t); |
val.size = sizeof(uint64_t); |
Line 1273 pformatted(DB *hash, struct buf *buf, struct buf *dbuf |
|
Line 1357 pformatted(DB *hash, struct buf *buf, struct buf *dbuf |
|
size_t len, plen; |
size_t len, plen; |
|
|
if (NULL == (stream = fopen(of->fname, "r"))) { |
if (NULL == (stream = fopen(of->fname, "r"))) { |
perror(of->fname); |
if (warnings) |
|
perror(of->fname); |
return; |
return; |
} |
} |
|
|
Line 1288 pformatted(DB *hash, struct buf *buf, struct buf *dbuf |
|
Line 1373 pformatted(DB *hash, struct buf *buf, struct buf *dbuf |
|
buf_append(buf, of->title); |
buf_append(buf, of->title); |
hash_put(hash, buf, TYPE_Nm); |
hash_put(hash, buf, TYPE_Nm); |
|
|
while (NULL != (line = fgetln(stream, &len)) && '\n' != *line) |
/* Skip to first blank line. */ |
/* Skip to first blank line. */ ; |
|
|
|
while (NULL != (line = fgetln(stream, &len)) && |
while (NULL != (line = fgetln(stream, &len))) |
('\n' == *line || ' ' == *line)) |
if ('\n' == *line) |
/* Skip to first section header. */ ; |
break; |
|
|
/* |
/* |
* If no page content can be found, |
* Assume the first line that is not indented |
* reuse the page title as the page description. |
* is the first section header. Skip to it. |
*/ |
*/ |
|
|
if (NULL == (line = fgetln(stream, &len))) { |
while (NULL != (line = fgetln(stream, &len))) |
|
if ('\n' != *line && ' ' != *line) |
|
break; |
|
|
|
/* |
|
* If no page content can be found, or the input line |
|
* is already the next section header, or there is no |
|
* trailing newline, reuse the page title as the page |
|
* description. |
|
*/ |
|
|
|
line = fgetln(stream, &len); |
|
if (NULL == line || ' ' != *line || '\n' != line[(int)len - 1]) { |
|
if (warnings) |
|
fprintf(stderr, "%s: cannot find NAME section\n", |
|
of->fname); |
buf_appendb(dbuf, buf->cp, buf->size); |
buf_appendb(dbuf, buf->cp, buf->size); |
hash_put(hash, buf, TYPE_Nd); |
hash_put(hash, buf, TYPE_Nd); |
fclose(stream); |
fclose(stream); |
return; |
return; |
} |
} |
fclose(stream); |
|
|
|
|
line[(int)--len] = '\0'; |
|
|
/* |
/* |
* If there is a dash, skip to the text following it. |
* Skip to the first dash. |
|
* Use the remaining line as the description (no more than 70 |
|
* bytes). |
*/ |
*/ |
|
|
for (p = line, plen = len; plen; p++, plen--) |
if (NULL != (p = strstr(line, "- "))) { |
if ('-' == *p) |
for (p += 2; ' ' == *p || '\b' == *p; p++) |
break; |
/* Skip to next word. */ ; |
for ( ; plen; p++, plen--) |
} else { |
if ('-' != *p && ' ' != *p && 8 != *p) |
if (warnings) |
break; |
fprintf(stderr, "%s: no dash in title line\n", |
if (0 == plen) { |
of->fname); |
p = line; |
p = line; |
plen = len; |
|
} |
} |
|
|
/* |
if ((plen = strlen(p)) > 70) { |
* Copy the rest of the line, but no more than 70 bytes. |
|
*/ |
|
|
|
if (70 < plen) |
|
plen = 70; |
plen = 70; |
p[plen-1] = '\0'; |
p[plen] = '\0'; |
buf_appendb(dbuf, p, plen); |
} |
|
|
|
/* Strip backspace-encoding from line. */ |
|
|
|
while (NULL != (line = memchr(p, '\b', plen))) { |
|
len = line - p; |
|
if (0 == len) { |
|
memmove(line, line + 1, plen--); |
|
continue; |
|
} |
|
memmove(line - 1, line + 1, plen - len); |
|
plen -= 2; |
|
} |
|
|
|
buf_appendb(dbuf, p, plen + 1); |
buf->len = 0; |
buf->len = 0; |
buf_appendb(buf, p, plen); |
buf_appendb(buf, p, plen + 1); |
hash_put(hash, buf, TYPE_Nd); |
hash_put(hash, buf, TYPE_Nd); |
|
fclose(stream); |
} |
} |
|
|
static void |
static void |
Line 1354 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
Line 1466 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
*/ |
*/ |
|
|
if (strlcpy(buf, argv[i], sizeof(buf)) >= sizeof(buf)) { |
if (strlcpy(buf, argv[i], sizeof(buf)) >= sizeof(buf)) { |
fprintf(stderr, "%s: Path too long\n", argv[i]); |
fprintf(stderr, "%s: path too long\n", argv[i]); |
continue; |
continue; |
} |
} |
sec = arch = title = NULL; |
sec = arch = title = ""; |
src_form = 0; |
src_form = 0; |
p = strrchr(buf, '\0'); |
p = strrchr(buf, '\0'); |
while (p-- > buf) { |
while (p-- > buf) { |
if (NULL == sec && '.' == *p) { |
if ('\0' == *sec && '.' == *p) { |
sec = p + 1; |
sec = p + 1; |
*p = '\0'; |
*p = '\0'; |
if ('0' == *sec) |
if ('0' == *sec) |
Line 1372 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
Line 1484 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
} |
} |
if ('/' != *p) |
if ('/' != *p) |
continue; |
continue; |
if (NULL == title) { |
if ('\0' == *title) { |
title = p + 1; |
title = p + 1; |
*p = '\0'; |
*p = '\0'; |
continue; |
continue; |
Line 1385 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
Line 1497 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
arch = p + 1; |
arch = p + 1; |
break; |
break; |
} |
} |
if (NULL == title) |
if ('\0' == *title) { |
|
if (warnings) |
|
fprintf(stderr, |
|
"%s: cannot deduce title " |
|
"from filename\n", |
|
argv[i]); |
title = buf; |
title = buf; |
|
} |
|
|
/* |
/* |
* Build the file structure. |
* Build the file structure. |
Line 1394 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
Line 1512 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
|
|
nof = mandoc_calloc(1, sizeof(struct of)); |
nof = mandoc_calloc(1, sizeof(struct of)); |
nof->fname = mandoc_strdup(argv[i]); |
nof->fname = mandoc_strdup(argv[i]); |
if (NULL != sec) |
nof->sec = mandoc_strdup(sec); |
nof->sec = mandoc_strdup(sec); |
nof->arch = mandoc_strdup(arch); |
if (NULL != arch) |
|
nof->arch = mandoc_strdup(arch); |
|
nof->title = mandoc_strdup(title); |
nof->title = mandoc_strdup(title); |
nof->src_form = src_form; |
nof->src_form = src_form; |
|
|
Line 1405 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
Line 1521 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
* Add the structure to the list. |
* Add the structure to the list. |
*/ |
*/ |
|
|
if (verb > 2) |
if (verb > 1) |
printf("%s: Scheduling\n", argv[i]); |
printf("%s: scheduling\n", argv[i]); |
if (NULL == *of) { |
if (NULL == *of) { |
*of = nof; |
*of = nof; |
(*of)->first = nof; |
(*of)->first = nof; |
Line 1426 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
Line 1542 ofile_argbuild(int argc, char *argv[], struct of **of) |
|
* everything else is a manual. |
* everything else is a manual. |
* Pass in a pointer to a NULL structure for the first invocation. |
* Pass in a pointer to a NULL structure for the first invocation. |
*/ |
*/ |
static int |
static void |
ofile_dirbuild(const char *dir, const char* psec, const char *parch, |
ofile_dirbuild(const char *dir, const char* psec, const char *parch, |
int p_src_form, struct of **of) |
int p_src_form, struct of **of) |
{ |
{ |
char buf[MAXPATHLEN]; |
char buf[MAXPATHLEN]; |
struct stat sb; |
|
size_t sz; |
size_t sz; |
DIR *d; |
DIR *d; |
const char *fn, *sec, *arch; |
const char *fn, *sec, *arch; |
Line 1441 ofile_dirbuild(const char *dir, const char* psec, cons |
|
Line 1556 ofile_dirbuild(const char *dir, const char* psec, cons |
|
int src_form; |
int src_form; |
|
|
if (NULL == (d = opendir(dir))) { |
if (NULL == (d = opendir(dir))) { |
perror(dir); |
if (warnings) |
return(0); |
perror(dir); |
|
return; |
} |
} |
|
|
while (NULL != (dp = readdir(d))) { |
while (NULL != (dp = readdir(d))) { |
Line 1463 ofile_dirbuild(const char *dir, const char* psec, cons |
|
Line 1579 ofile_dirbuild(const char *dir, const char* psec, cons |
|
* cat<section>/[<arch>/] |
* cat<section>/[<arch>/] |
*/ |
*/ |
|
|
if (NULL == sec) { |
if ('\0' == *sec) { |
if(0 == strncmp("man", fn, 3)) { |
if(0 == strncmp("man", fn, 3)) { |
src_form |= MANDOC_SRC; |
src_form |= MANDOC_SRC; |
sec = fn + 3; |
sec = fn + 3; |
} else if (0 == strncmp("cat", fn, 3)) { |
} else if (0 == strncmp("cat", fn, 3)) { |
src_form |= MANDOC_FORM; |
src_form |= MANDOC_FORM; |
sec = fn + 3; |
sec = fn + 3; |
} else if (use_all) |
} else { |
sec = fn; |
if (warnings) fprintf(stderr, |
else |
"%s/%s: bad section\n", |
continue; |
dir, fn); |
} else if (NULL == arch && (use_all || |
if (use_all) |
NULL == strchr(fn, '.'))) |
sec = fn; |
|
else |
|
continue; |
|
} |
|
} else if ('\0' == *arch) { |
|
if (NULL != strchr(fn, '.')) { |
|
if (warnings) fprintf(stderr, |
|
"%s/%s: bad architecture\n", |
|
dir, fn); |
|
if (0 == use_all) |
|
continue; |
|
} |
arch = fn; |
arch = fn; |
else if (0 == use_all) |
} else { |
continue; |
if (warnings) fprintf(stderr, "%s/%s: " |
|
"excessive subdirectory\n", dir, fn); |
|
if (0 == use_all) |
|
continue; |
|
} |
|
|
buf[0] = '\0'; |
buf[0] = '\0'; |
strlcat(buf, dir, MAXPATHLEN); |
strlcat(buf, dir, MAXPATHLEN); |
Line 1486 ofile_dirbuild(const char *dir, const char* psec, cons |
|
Line 1617 ofile_dirbuild(const char *dir, const char* psec, cons |
|
sz = strlcat(buf, fn, MAXPATHLEN); |
sz = strlcat(buf, fn, MAXPATHLEN); |
|
|
if (MAXPATHLEN <= sz) { |
if (MAXPATHLEN <= sz) { |
fprintf(stderr, "%s: Path too long\n", dir); |
if (warnings) fprintf(stderr, "%s/%s: " |
return(0); |
"path too long\n", dir, fn); |
|
continue; |
} |
} |
|
|
if (verb > 2) |
|
printf("%s: Scanning\n", buf); |
|
|
|
if ( ! ofile_dirbuild(buf, sec, arch, |
if (verb > 1) |
src_form, of)) |
printf("%s: scanning\n", buf); |
return(0); |
|
|
ofile_dirbuild(buf, sec, arch, src_form, of); |
|
continue; |
} |
} |
if (DT_REG != dp->d_type || |
|
(NULL == psec && !use_all) || |
if (DT_REG != dp->d_type) { |
!strcmp(MANDOC_DB, fn) || |
if (warnings) |
!strcmp(MANDOC_IDX, fn)) |
fprintf(stderr, |
|
"%s/%s: not a regular file\n", |
|
dir, fn); |
continue; |
continue; |
|
} |
|
if (!strcmp(MANDOC_DB, fn) || !strcmp(MANDOC_IDX, fn)) |
|
continue; |
|
if ('\0' == *psec) { |
|
if (warnings) |
|
fprintf(stderr, |
|
"%s/%s: file outside section\n", |
|
dir, fn); |
|
if (0 == use_all) |
|
continue; |
|
} |
|
|
/* |
/* |
* By default, skip files where the file name suffix |
* By default, skip files where the file name suffix |
Line 1510 ofile_dirbuild(const char *dir, const char* psec, cons |
|
Line 1654 ofile_dirbuild(const char *dir, const char* psec, cons |
|
*/ |
*/ |
|
|
suffix = strrchr(fn, '.'); |
suffix = strrchr(fn, '.'); |
if (0 == use_all) { |
if (NULL == suffix) { |
if (NULL == suffix) |
if (warnings) |
|
fprintf(stderr, |
|
"%s/%s: no filename suffix\n", |
|
dir, fn); |
|
if (0 == use_all) |
continue; |
continue; |
if ((MANDOC_SRC & src_form && |
} else if ((MANDOC_SRC & src_form && |
strcmp(suffix + 1, psec)) || |
strcmp(suffix + 1, psec)) || |
(MANDOC_FORM & src_form && |
(MANDOC_FORM & src_form && |
strcmp(suffix + 1, "0"))) |
strcmp(suffix + 1, "0"))) { |
continue; |
if (warnings) |
} |
fprintf(stderr, |
if (NULL != suffix) { |
"%s/%s: wrong filename suffix\n", |
|
dir, fn); |
|
if (0 == use_all) |
|
continue; |
if ('0' == suffix[1]) |
if ('0' == suffix[1]) |
src_form |= MANDOC_FORM; |
src_form |= MANDOC_FORM; |
else if ('1' <= suffix[1] && '9' >= suffix[1]) |
else if ('1' <= suffix[1] && '9' >= suffix[1]) |
src_form |= MANDOC_SRC; |
src_form |= MANDOC_SRC; |
} |
} |
|
|
|
|
/* |
/* |
* Skip formatted manuals if a source version is |
* Skip formatted manuals if a source version is |
* available. Ignore the age: it is very unlikely |
* available. Ignore the age: it is very unlikely |
Line 1535 ofile_dirbuild(const char *dir, const char* psec, cons |
|
Line 1685 ofile_dirbuild(const char *dir, const char* psec, cons |
|
* and in ports, old manuals get removed on update. |
* and in ports, old manuals get removed on update. |
*/ |
*/ |
if (0 == use_all && MANDOC_FORM & src_form && |
if (0 == use_all && MANDOC_FORM & src_form && |
NULL != psec) { |
'\0' != *psec) { |
buf[0] = '\0'; |
buf[0] = '\0'; |
strlcat(buf, dir, MAXPATHLEN); |
strlcat(buf, dir, MAXPATHLEN); |
p = strrchr(buf, '/'); |
p = strrchr(buf, '/'); |
|
if ('\0' != *parch && NULL != p) |
|
for (p--; p > buf; p--) |
|
if ('/' == *p) |
|
break; |
if (NULL == p) |
if (NULL == p) |
p = buf; |
p = buf; |
else |
else |
Line 1548 ofile_dirbuild(const char *dir, const char* psec, cons |
|
Line 1702 ofile_dirbuild(const char *dir, const char* psec, cons |
|
strlcat(buf, "/", MAXPATHLEN); |
strlcat(buf, "/", MAXPATHLEN); |
sz = strlcat(buf, fn, MAXPATHLEN); |
sz = strlcat(buf, fn, MAXPATHLEN); |
if (sz >= MAXPATHLEN) { |
if (sz >= MAXPATHLEN) { |
fprintf(stderr, "%s: Path too long\n", buf); |
if (warnings) fprintf(stderr, |
|
"%s/%s: path too long\n", |
|
dir, fn); |
continue; |
continue; |
} |
} |
q = strrchr(buf, '.'); |
q = strrchr(buf, '.'); |
Line 1556 ofile_dirbuild(const char *dir, const char* psec, cons |
|
Line 1712 ofile_dirbuild(const char *dir, const char* psec, cons |
|
*q = '\0'; |
*q = '\0'; |
sz = strlcat(buf, psec, MAXPATHLEN); |
sz = strlcat(buf, psec, MAXPATHLEN); |
if (sz >= MAXPATHLEN) { |
if (sz >= MAXPATHLEN) { |
fprintf(stderr, |
if (warnings) fprintf(stderr, |
"%s: Path too long\n", buf); |
"%s/%s: path too long\n", |
|
dir, fn); |
continue; |
continue; |
} |
} |
if (0 == stat(buf, &sb)) |
if (0 == access(buf, R_OK)) |
continue; |
continue; |
} |
} |
} |
} |
|
|
buf[0] = '\0'; |
buf[0] = '\0'; |
strlcat(buf, dir, MAXPATHLEN); |
assert('.' == dir[0]); |
strlcat(buf, "/", MAXPATHLEN); |
if ('/' == dir[1]) { |
|
strlcat(buf, dir + 2, MAXPATHLEN); |
|
strlcat(buf, "/", MAXPATHLEN); |
|
} |
sz = strlcat(buf, fn, MAXPATHLEN); |
sz = strlcat(buf, fn, MAXPATHLEN); |
if (sz >= MAXPATHLEN) { |
if (sz >= MAXPATHLEN) { |
fprintf(stderr, "%s: Path too long\n", dir); |
if (warnings) fprintf(stderr, |
|
"%s/%s: path too long\n", dir, fn); |
continue; |
continue; |
} |
} |
|
|
nof = mandoc_calloc(1, sizeof(struct of)); |
nof = mandoc_calloc(1, sizeof(struct of)); |
nof->fname = mandoc_strdup(buf); |
nof->fname = mandoc_strdup(buf); |
if (NULL != psec) |
nof->sec = mandoc_strdup(psec); |
nof->sec = mandoc_strdup(psec); |
nof->arch = mandoc_strdup(parch); |
if (NULL != parch) |
|
nof->arch = mandoc_strdup(parch); |
|
nof->src_form = src_form; |
nof->src_form = src_form; |
|
|
/* |
/* |
Line 1595 ofile_dirbuild(const char *dir, const char* psec, cons |
|
Line 1754 ofile_dirbuild(const char *dir, const char* psec, cons |
|
* Add the structure to the list. |
* Add the structure to the list. |
*/ |
*/ |
|
|
if (verb > 2) |
if (verb > 1) |
printf("%s: Scheduling\n", buf); |
printf("%s: scheduling\n", buf); |
if (NULL == *of) { |
if (NULL == *of) { |
*of = nof; |
*of = nof; |
(*of)->first = nof; |
(*of)->first = nof; |
Line 1608 ofile_dirbuild(const char *dir, const char* psec, cons |
|
Line 1767 ofile_dirbuild(const char *dir, const char* psec, cons |
|
} |
} |
|
|
closedir(d); |
closedir(d); |
return(1); |
|
} |
} |
|
|
static void |
static void |
Line 1625 ofile_free(struct of *of) |
|
Line 1783 ofile_free(struct of *of) |
|
free(of); |
free(of); |
of = nof; |
of = nof; |
} |
} |
} |
|
|
|
static void |
|
usage(void) |
|
{ |
|
|
|
fprintf(stderr, "usage: %s [-v] " |
|
"[-d dir [files...] |" |
|
" -u dir [files...] |" |
|
" dir...]\n", progname); |
|
} |
} |