[cvs] bogofilter/src datastore_db.c,1.160,1.161

[<m-...@us...>]

Update of /cvsroot/bogofilter/bogofilter/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12323/src

Modified Files:
	datastore_db.c 
Log Message:
Be smarter when opening the environment fails, f. i. do not suggest running
standard recovery if opening with recovery option has just failed.

Index: datastore_db.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/datastore_db.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- datastore_db.c	27 Jan 2005 02:41:20 -0000	1.160
+++ datastore_db.c	27 Jan 2005 11:33:05 -0000	1.161
@@ -1056,8 +1056,27 @@
 	print_error(__FILE__, __LINE__, "DB_ENV->open, err: %s", db_strerror(ret));
 	switch (ret) {
 	    case DB_RUNRECOVERY:
-		fprintf(stderr, "To recover, run: bogoutil -v --db-recover \"%s\"\n",
-			directory);
+		if (flags & DB_RECOVER) {
+		    fprintf(stderr,
+			    "\n"
+			    "### Standard recovery failed. ###\n"
+			    "\n"
+			    "Please check section 3.3 in bogofilter's README.db file\n"
+			    "for help.\n");
+		    /* ask that the user runs catastrophic recovery */
+		} else if (flags & DB_RECOVER_FATAL) {
+		    fprintf(stderr,
+			    "\n"
+			    "### Catastrophic recovery failed. ###\n"
+			    "\n"
+			    "Please check the README.db file that came with bogofilter for hints,\n"
+			    "section 3.3, or remove all __db.*, log.* and *.db files in \"%s\"\n"
+			    "and start from scratch.\n", directory);
+		    /* catastrophic recovery failed */
+		} else {
+		    fprintf(stderr, "To recover, run: bogoutil -v --db-recover \"%s\"\n",
+			    directory);
+		}
 		break;
 	    case EINVAL:
 		fprintf(stderr, "\n"