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;
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;
+ }
}
/*
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
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)