X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=filter.c;h=65bd38a673cc9685e958ccb9871065462be05dfa;hb=619fd0273195809d9bc1e1d36814307957303e8e;hp=0020fc201fd43158a7c3dd00d72ca5403d3c7fab;hpb=4909ba20244f55ee7326a40d751cf6737c2bc2b6;p=pkg%2Fabook.git

diff --git a/filter.c b/filter.c
index 0020fc2..65bd38a 100644
--- a/filter.c
+++ b/filter.c
@@ -27,7 +27,6 @@
 #include "xmalloc.h"
 #include <assert.h>
 
-extern int items;
 extern abook_field_list *fields_list;
 extern int fields_count;
 
@@ -194,7 +193,7 @@ import_database()
 {
 	int filter;
 	char *filename;
-	int tmp = items;
+	int tmp = db_n_items();
 
 	import_screen();
 
@@ -215,7 +214,7 @@ import_database()
 
 	if(i_read_file(filename, i_filters[filter].func ))
 		statusline_msg(_("Error occured while opening the file"));
-	else if(tmp == items)
+	else if(tmp == db_n_items())
 		statusline_msg(_("File does not seem to be a valid addressbook"));
 
 	refresh_screen();
@@ -246,7 +245,7 @@ int
 import_file(char filtname[FILTNAME_LEN], char *filename)
 {
 	int i;
-	int tmp = items;
+	int tmp = db_n_items();
 	int ret = 0;
 
 	for(i=0;; i++) {
@@ -271,7 +270,7 @@ import_file(char filtname[FILTNAME_LEN], char *filename)
 	} else
 		ret =  i_read_file(filename, i_filters[i].func);
 
-	if(tmp == items)
+	if(tmp == db_n_items())
 		ret = 1;
 
 	return ret;
@@ -842,7 +841,7 @@ html_export_database(FILE *out, struct db_enumerator e)
 	char tmp[MAX_EMAILSTR_LEN];
 	int extra_column;
 
-	if(items < 1)
+	if(list_is_empty())
 		return 2;
 
 	extra_column = init_extra_field(STR_EXTRA_COLUMN);
@@ -1504,7 +1503,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 	abook_list *emails, *em;
 
 	db_enumerate_items(e) {
-		fprintf(out, "BEGIN:VCARD\nFN:%s\n",
+		fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
 				safe_str(db_name_get(e.item)));
 
 		name = get_surname(db_name_get(e.item));
@@ -1512,7 +1511,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 	                if((db_name_get(e.item))[j] == ' ')
 	                        break;
 	        }
-		fprintf(out, "N:%s;%.*s\n",
+		fprintf(out, "N:%s;%.*s\r\n",
 			safe_str(name),
 			j,
 			safe_str(db_name_get(e.item))
@@ -1521,7 +1520,7 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 		free(name);
 
 		if(db_fget(e.item, ADDRESS))
-			fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\n",
+			fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
 				safe_str(db_fget(e.item, ADDRESS)),
 				safe_str(db_fget(e.item, ADDRESS2)),
 				safe_str(db_fget(e.item, CITY)),
@@ -1531,35 +1530,35 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 				);
 
 		if(db_fget(e.item, PHONE))
-			fprintf(out, "TEL;HOME:%s\n",
+			fprintf(out, "TEL;HOME:%s\r\n",
 					db_fget(e.item, PHONE));
 		if(db_fget(e.item, WORKPHONE))
-			fprintf(out, "TEL;WORK:%s\n",
+			fprintf(out, "TEL;WORK:%s\r\n",
 					db_fget(e.item, WORKPHONE));
 		if(db_fget(e.item, FAX))
-			fprintf(out, "TEL;FAX:%s\n",
+			fprintf(out, "TEL;FAX:%s\r\n",
 					db_fget(e.item, FAX));
 		if(db_fget(e.item, MOBILEPHONE))
-			fprintf(out, "TEL;CELL:%s\n",
+			fprintf(out, "TEL;CELL:%s\r\n",
 					db_fget(e.item, MOBILEPHONE));
 
 		if(*db_email_get(e.item)) {
 			emails = csv_to_abook_list(db_email_get(e.item));
 
 			for(em = emails; em; em = em->next)
-				fprintf(out, "EMAIL;INTERNET:%s\n", em->data);
+				fprintf(out, "EMAIL;INTERNET:%s\r\n", em->data);
 
 			abook_list_free(&emails);
 		}
 
 		if(db_fget(e.item, NOTES))
-			fprintf(out, "NOTE:%s\n",
+			fprintf(out, "NOTE:%s\r\n",
 					db_fget(e.item, NOTES));
 		if(db_fget(e.item, URL))
-			fprintf(out, "URL:%s\n",
+			fprintf(out, "URL:%s\r\n",
 					db_fget(e.item, URL));
 
-		fprintf(out, "END:VCARD\n\n");
+		fprintf(out, "END:VCARD\r\n\r\n");
 
 	}