 @@ -1,14 +1,14 @@
-/*	$NetBSD: db.c,v 1.20 2008/09/05 07:55:33 lukem Exp $	*/
+/*	$NetBSD: db.c,v 1.21 2008/10/07 01:32:51 lukem Exp $	*/
 /*-
  * Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn of Wasabi Systems.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,32 +22,32 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #ifdef __RCSID
-__RCSID("$NetBSD: db.c,v 1.20 2008/09/05 07:55:33 lukem Exp $");
+__RCSID("$NetBSD: db.c,v 1.21 2008/10/07 01:32:51 lukem Exp $");
 #endif /* __RCSID */
 #endif /* not lint */
 #include <db.h>
 #include <ctype.h>
 #include <db.h>
 #include <err.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <vis.h>
 typedef enum {
 	F_WRITE		= 1<<0,
 	F_DELETE	= 1<<1,
 @@ -431,41 +431,46 @@ db_makekey(DBT *key, char *keystr, int d
 	key->data = ks;
 	key->size = klen + (flags & F_NO_NUL ? 0 : 1);
 	if (downcase && (flags & F_IGNORECASE)) {
 		for (p = ks; *p; p++)
 			if (isupper((int)*p))
 				*p = tolower((int)*p);
+	}
+}
 int
 db_del(char *keystr)
+{
 	DBT	key;
-	int	r = 0;
+	int	r;
 	db_makekey(&key, keystr, 1, (flags & F_DECODE_KEY ? 1 : 0));
-	switch (db->del(db, &key, 0)) {
+	r = db->del(db, &key, 0);
 	switch (r) {
 	case -1:
-		warn("Error deleting key `%s'", keystr);
+		if (! (flags & F_QUIET))
 			warn("Error deleting key `%s'", keystr);
 		r = 1;
 		break;
 	case 0:
 		if (! (flags & F_QUIET))
 			printf("Deleted key `%s'\n", keystr);
 		break;
 	case 1:
-		warnx("Unknown key `%s'", keystr);
+		if (! (flags & F_QUIET))
 			warnx("Unknown key `%s'", keystr);
 		break;
 	default:
 		abort();
+	}
 	if (flags & F_DECODE_KEY)
 		free(key.data);
 	return (r);
+}
 int
 db_get(char *keystr)
+{
 	DBT	key, val;
 	char	*wantkey;
 	int	r, found;
 	u_int	seqflags;
 @@ -495,55 +500,59 @@ db_get(char *keystr)
 		r = 1;
 		break;
 	case 0:
 		break;
 	case 1:
 		if (found) {
 			r = 0;
 			break;
+		}
 		if (! (flags & F_QUIET)) {
 			warnx("Unknown key `%s'", keystr);
+		}
 		break;
 	default:
 		abort();
+	}
 	if (flags & F_DECODE_KEY)
 		free(key.data);
 	free(wantkey);
 	return (r);
+}
 int
 db_put(char *keystr, char *valstr)
+{
 	DBT	key, val;
 	int	r = 0;
 	db_makekey(&key, keystr, 1, (flags & F_DECODE_KEY ? 1 : 0));
 	db_makekey(&val, valstr, 0, (flags & F_DECODE_VAL ? 1 : 0));
-	switch (db->put(db, &key, &val,
+	r = db->put(db, &key, &val, (flags & F_REPLACE) ? 0 : R_NOOVERWRITE);
-	    (flags & F_REPLACE) ? 0 : R_NOOVERWRITE)) {
+	switch (r) {
 	case -1:
 		warn("Error writing key `%s'", keystr);
 		r = 1;
 		break;
 	case 0:
 		if (! (flags & F_QUIET))
 			printf("Added key `%s'\n", keystr);
 		break;
 	case 1:
 		if (! (flags & F_QUIET))
 			warnx("Key `%s' already exists", keystr);
 		break;
 	default:
 		abort();
+	}
 	if (flags & F_DECODE_KEY)
 		free(key.data);
 	if (flags & F_DECODE_VAL)
 		free(val.data);
 	return (r);
+}
 int
 parseline(FILE *fp, const char *sep, char **kp, char **vp)
+{
 	size_t	len;
 	char	*key, *val;