diff options
| -rw-r--r-- | mandocdb.8 | 8 | ||||
| -rw-r--r-- | mandocdb.c | 46 |
2 files changed, 44 insertions, 10 deletions
@@ -1,4 +1,4 @@ -.\" $Id: mandocdb.8,v 1.24 2014/04/03 16:27:28 schwarze Exp $ +.\" $Id: mandocdb.8,v 1.25 2014/04/04 02:31:07 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: April 3 2014 $ +.Dd $Mdocdate: April 4 2014 $ .Dt MANDOCDB 8 .Os .Sh NAME @@ -105,8 +105,8 @@ Merge (remove and re-add) to the database in .Ar dir . .It Fl n -Do not create or modify any database; -scan and parse only. +Do not create or modify any database; scan and parse only, +and print manual page names and descriptions to standard output. .It Fl p Print warnings about potential problems with manual pages to the standard error output. @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.127 2014/04/03 21:45:31 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.128 2014/04/04 02:31:07 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -1858,11 +1858,43 @@ dbadd(struct mpage *mpage, struct mchars *mc) size_t i; unsigned int slot; - if (debug) - say(mpage->mlinks->file, "Adding to database"); - - if (nodb) + mlink = mpage->mlinks; + + if (nodb) { + while (NULL != mlink) { + fputs(mlink->name, stdout); + if (NULL == mlink->next || + strcmp(mlink->dsec, mlink->next->dsec) || + strcmp(mlink->fsec, mlink->next->fsec) || + strcmp(mlink->arch, mlink->next->arch)) { + putchar('('); + if ('\0' == *mlink->dsec) + fputs(mlink->fsec, stdout); + else + fputs(mlink->dsec, stdout); + if ('\0' != *mlink->arch) + printf("/%s", mlink->arch); + putchar(')'); + } + mlink = mlink->next; + if (NULL != mlink) + fputs(", ", stdout); + } + for (key = ohash_first(&strings, &slot); NULL != key; + key = ohash_next(&strings, &slot)) { + if (TYPE_Nd & key->mask) { + if (NULL == key->rendered) + render_key(mc, key); + printf(" - %s", key->rendered); + break; + } + } + putchar('\n'); return; + } + + if (debug) + say(mlink->file, "Adding to database"); i = 1; SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form); @@ -1870,8 +1902,10 @@ dbadd(struct mpage *mpage, struct mchars *mc) mpage->recno = sqlite3_last_insert_rowid(db); sqlite3_reset(stmts[STMT_INSERT_PAGE]); - for (mlink = mpage->mlinks; mlink; mlink = mlink->next) + while (NULL != mlink) { dbadd_mlink(mlink); + mlink = mlink->next; + } for (key = ohash_first(&strings, &slot); NULL != key; key = ohash_next(&strings, &slot)) { |