===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.103
retrieving revision 1.106
diff -u -p -r1.103 -r1.106
--- mandoc/mandocdb.c	2014/01/06 03:02:46	1.103
+++ mandoc/mandocdb.c	2014/01/06 15:32:47	1.106
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.103 2014/01/06 03:02:46 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.106 2014/01/06 15:32:47 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -130,7 +130,7 @@ struct	mdoc_handler {
 };
 
 static	void	 dbclose(int);
-static	void	 dbindex(const struct mpage *, struct mchars *);
+static	void	 dbadd(const struct mpage *, struct mchars *);
 static	int	 dbopen(int);
 static	void	 dbprune(void);
 static	void	 filescan(const char *);
@@ -700,11 +700,19 @@ filescan(const char *file)
 		exitcode = (int)MANDOCLEVEL_BADARG;
 		say(file, NULL);
 		return;
-	} else if (OP_TEST != op && strstr(buf, basedir) != buf) {
+	}
+
+	if (strstr(buf, basedir) == buf)
+		start = buf + strlen(basedir) + 1;
+	else if (OP_TEST == op)
+		start = buf;
+	else {
 		exitcode = (int)MANDOCLEVEL_BADARG;
 		say("", "%s: outside base directory", buf);
 		return;
-	} else if (-1 == stat(buf, &st)) {
+	}
+
+	if (-1 == stat(buf, &st)) {
 		exitcode = (int)MANDOCLEVEL_BADARG;
 		say(file, NULL);
 		return;
@@ -713,7 +721,7 @@ filescan(const char *file)
 		say(file, "Not a regular file");
 		return;
 	}
-	start = buf + strlen(basedir);
+
 	mlink = mandoc_calloc(1, sizeof(struct mlink));
 	strlcpy(mlink->file, start, sizeof(mlink->file));
 
@@ -1047,7 +1055,7 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
 		else
 			parse_cat(mpage);
 
-		dbindex(mpage, mc);
+		dbadd(mpage, mc);
 		ohash_delete(&strings);
 		mpage = ohash_next(&mpages, &pslot);
 	}
@@ -1732,7 +1740,7 @@ render_key(struct mchars *mc, struct str *key)
  * Also, handle escape sequences at the last possible moment.
  */
 static void
-dbindex(const struct mpage *mpage, struct mchars *mc)
+dbadd(const struct mpage *mpage, struct mchars *mc)
 {
 	struct mlink	*mlink;
 	struct str	*key;
@@ -1741,7 +1749,7 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
 	unsigned int	 slot;
 
 	if (verb)
-		say(mpage->mlinks->file, "Adding to index");
+		say(mpage->mlinks->file, "Adding to database");
 
 	if (nodb)
 		return;
@@ -1756,7 +1764,6 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
 
 	for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
 		i = 1;
-		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->file);
 		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec);
 		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch);
 		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name);
@@ -1792,20 +1799,31 @@ dbprune(void)
 	size_t		 i;
 	unsigned int	 slot;
 
-	if (nodb)
-		return;
+	if (0 == nodb)
+		SQL_EXEC("BEGIN TRANSACTION");
 
-	mpage = ohash_first(&mpages, &slot);
-	while (NULL != mpage) {
+	for (mpage = ohash_first(&mpages, &slot); NULL != mpage;
+	     mpage = ohash_next(&mpages, &slot)) {
 		mlink = mpage->mlinks;
-		i = 1;
-		SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE], i, mlink->file);
-		SQL_STEP(stmts[STMT_DELETE_PAGE]);
-		sqlite3_reset(stmts[STMT_DELETE_PAGE]);
 		if (verb)
-			say(mlink->file, "Deleted from index");
-		mpage = ohash_next(&mpages, &slot);
+			say(mlink->file, "Deleting from database");
+		if (nodb)
+			continue;
+		for ( ; NULL != mlink; mlink = mlink->next) {
+			i = 1;
+			SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],
+			    i, mlink->dsec);
+			SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],
+			    i, mlink->arch);
+			SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],
+			    i, mlink->name);
+			SQL_STEP(stmts[STMT_DELETE_PAGE]);
+			sqlite3_reset(stmts[STMT_DELETE_PAGE]);
+		}
 	}
+
+	if (0 == nodb)
+		SQL_EXEC("END TRANSACTION");
 }
 
 /*
@@ -1890,7 +1908,6 @@ dbopen(int real)
 	      ");\n"
 	      "\n"
 	      "CREATE TABLE \"mlinks\" (\n"
-	      " \"file\" TEXT NOT NULL,\n"
 	      " \"sec\" TEXT NOT NULL,\n"
 	      " \"arch\" TEXT NOT NULL,\n"
 	      " \"name\" TEXT NOT NULL,\n"
@@ -1917,13 +1934,15 @@ dbopen(int real)
 
 prepare_statements:
 	SQL_EXEC("PRAGMA foreign_keys = ON");
-	sql = "DELETE FROM mpages where file=?";
+	sql = "DELETE FROM mpages WHERE id IN "
+		"(SELECT pageid FROM mlinks WHERE "
+		"sec=? AND arch=? AND name=?)";
 	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);
 	sql = "INSERT INTO mpages "
 		"(form) VALUES (?)";
 	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL);
 	sql = "INSERT INTO mlinks "
-		"(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)";
+		"(sec,arch,name,pageid) VALUES (?,?,?,?)";
 	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);
 	sql = "INSERT INTO keys "
 		"(bits,key,pageid) VALUES (?,?,?)";