X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=database.c;h=973c0a5a0c3928c17b45e900aaf731ef5b2baf05;hb=e2826ae894d12e69674d1b624e87c05e6bbb2afd;hp=ddc96ab21aaa047ee6235a102a4d31f61320b14e;hpb=7d0f197384f747d26191efe1cd98405401afc806;p=pkg%2Fabook.git

diff --git a/database.c b/database.c
index ddc96ab..973c0a5 100644
--- a/database.c
+++ b/database.c
@@ -2,7 +2,7 @@
 /*
  * $Id$
  *
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -107,9 +107,12 @@ parse_database(FILE *in)
 		} else if((tmp = strchr(line, '=') ) && sec ) {
 			*tmp++ = '\0';
 			for(i=0; i<ITEM_FIELDS; i++)
-				if( !strcmp(abook_fields[i].key, line) )
+				if( !strcmp(abook_fields[i].key, line) ) {
 					item[i] = strdup(tmp);
+					goto next;
+				}
 		}
+next:
 		free(line);
 	}
 
@@ -144,15 +147,17 @@ write_database(FILE *out, struct db_enumerator e)
 	int j;
 	int i = 0;
 
-	fprintf(out, "# abook addressbook file\n\n");
-	fprintf(out, "[format]\n");
-	fprintf(out, "program=" PACKAGE "\n");
-	fprintf(out, "version=" VERSION "\n");
-	fprintf(out, "\n\n");
+	fprintf(out,
+		"# abook addressbook file\n\n"
+		"[format]\n"
+		"program=" PACKAGE "\n"
+		"version=" VERSION "\n"
+		"\n\n"
+	);
 
 	db_enumerate_items(e) {
 		fprintf(out, "[%d]\n", i);
-		for(j=0; j<ITEM_FIELDS; j++) {
+		for(j = 0; j < ITEM_FIELDS; j++) {
 			if( database[e.item][j] != NULL &&
 					*database[e.item][j] )
 				fprintf(out, "%s=%s\n",
@@ -226,7 +231,7 @@ close_database()
 
 #define _MAX_FIELD_LEN(X)	(X == EMAIL ? MAX_EMAILSTR_LEN:MAX_FIELD_LEN)
 
-inline static void
+static void
 validate_item(list_item item)
 {
 	int i;
@@ -386,26 +391,30 @@ sort_surname()
 }
 
 int
-find_item(char *str, int start)
+find_item(char *str, int start, int search_fields[])
 {
 	int i;
 	char *findstr = NULL;
 	char *tmp = NULL;
 	int ret = -1; /* not found */
+	struct db_enumerator e = init_db_enumerator(ENUM_ALL);
 
-	if(items < 1 || start < 0 || start >= LAST_ITEM)
+	if(list_is_empty() || !is_valid_item(start))
 		return -2; /* error */
 
 	findstr = strdup(str);
 	findstr = strupper(findstr);
 
-	for( i = start; i < items; i++ ) {
-		tmp = strdup(database[i][NAME]);
-		if( strstr(strupper(tmp), findstr) != NULL ) {
-			ret = i;
-			goto out;
+	e.item = start - 1; /* must be "real start" - 1 */
+	db_enumerate_items(e) {
+		for( i = 0; search_fields[i] >= 0; i++ ) {
+			tmp = safe_strdup(database[e.item][search_fields[i]]);
+			if( tmp && strstr(strupper(tmp), findstr) ) {
+				ret = e.item;
+				goto out;
+			}
+			my_free(tmp);
 		}
-		my_free(tmp);
 	}
 
 out: