X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=database.c;h=729db926bb922ca214f210f0e71b46fe85388e91;hb=a7b46a66b2265d69776ec28d9f643eb4f1506439;hp=893cb9902cd5dd8456394007b9108e8b4a9d38c9;hpb=4909ba20244f55ee7326a40d751cf6737c2bc2b6;p=pkg%2Fabook.git

diff --git a/database.c b/database.c
index 893cb99..729db92 100644
--- a/database.c
+++ b/database.c
@@ -26,9 +26,10 @@ abook_field_list *fields_list = NULL;
 int fields_count = 0;
 
 list_item *database = NULL;
-int items = 0;
+static int items = 0;
 
 #define ITEM_SIZE (fields_count * sizeof(char *))
+#define LAST_ITEM (items - 1)
 
 #define INITIAL_LIST_CAPACITY	30
 static int list_capacity = 0;
@@ -202,9 +203,11 @@ declare_unknown_field(char *key)
 	if(!database)
 		return;
 
-	for(i = 0; i < fields_count; i++)
-		if(database[i])
+	for(i = 0; i < items; i++)
+		if(database[i]) {
 			database[i] = xrealloc(database[i], ITEM_SIZE);
+			database[i][fields_count - 1] = NULL;
+		}
 }
 
 /*
@@ -345,23 +348,41 @@ int
 save_database()
 {
 	FILE *out;
+	int ret = 0;
 	struct db_enumerator e = init_db_enumerator(ENUM_ALL);
+	char *datafile_new = strconcat(datafile, ".new", NULL);
+	char *datafile_old = strconcat(datafile, "~", NULL);
 
-	if( (out = abook_fopen(datafile, "w")) == NULL )
-		return -1;
+	if( (out = abook_fopen(datafile_new, "w")) == NULL ) {
+		ret = -1;
+		goto out;
+	}
 
 	if(list_is_empty()) {
 		fclose(out);
 		unlink(datafile);
-		return 1;
+		ret = 1;
+		goto out;
 	}
 
-
+	/*
+	 * Possibly should check if write_database failed.
+	 * Currently it returns always zero.
+	 */
 	write_database(out, e);
-
 	fclose(out);
 
-	return 0;
+	if(access(datafile, F_OK) == 0 &&
+			(rename(datafile, datafile_old)) == -1)
+		ret = -1;
+	
+	if((rename(datafile_new, datafile)) == -1)
+		ret = -1;
+
+out:
+	free(datafile_new);
+	free(datafile_old);
+	return ret;
 }
 
 static void
@@ -642,6 +663,17 @@ is_valid_item(int item)
 	return item <= LAST_ITEM && item >= 0;
 }
 
+int
+last_item()
+{
+	return LAST_ITEM;
+}
+
+int
+db_n_items()
+{
+	return items;
+}
 
 int
 real_db_enumerate_items(struct db_enumerator e)