diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-01-05 20:26:36 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-01-05 20:26:36 +0000 |
| commit | 3d871d9086bbc5f79cd485dfb26b9d02a19cf2e3 (patch) | |
| tree | 12c6882973b4bed0d9b5eb332153635e293e50e2 /mdoc.c | |
| parent | d9597fb775134ff4c4ae106fdb7f3214b5af2463 (diff) | |
| download | mandoc-3d871d9086bbc5f79cd485dfb26b9d02a19cf2e3.tar.gz mandoc-3d871d9086bbc5f79cd485dfb26b9d02a19cf2e3.tar.zst mandoc-3d871d9086bbc5f79cd485dfb26b9d02a19cf2e3.zip | |
Add an option -Q (quick) to mandocdb(8)
for accelerated generation of reduced-size databases.
Implement this by allowing the parsers to optionally
abort the parse sequence after the NAME section.
While here, garbage collect the unused void *arg attribute of
struct mparse and mparse_alloc() and fix some errors in mandoc(3).
This reduces the processing time of mandocdb(8) on /usr/share/man
by a factor of 2 and the database size by a factor of 4.
However, it still takes 5 times the time and 6 times the space
of makewhatis(8), so more work is clearly needed.
Diffstat (limited to 'mdoc.c')
| -rw-r--r-- | mdoc.c | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -1,7 +1,7 @@ -/* $Id: mdoc.c,v 1.207 2013/12/31 23:23:11 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.208 2014/01/05 20:26:36 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -197,7 +197,8 @@ mdoc_free(struct mdoc *mdoc) * Allocate volatile and non-volatile parse resources. */ struct mdoc * -mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos) +mdoc_alloc(struct roff *roff, struct mparse *parse, + char *defos, int quick) { struct mdoc *p; @@ -205,6 +206,7 @@ mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos) p->parse = parse; p->defos = defos; + p->quick = quick; p->roff = roff; mdoc_hash_init(); @@ -961,6 +963,12 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs) if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) goto err; + /* In quick mode (for mandocdb), abort after the NAME section. */ + + if (mdoc->quick && MDOC_Sh == tok && + SEC_NAME != mdoc->last->sec) + return(2); + return(1); err: /* Error out. */ |