X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=filter.c;h=cb52ade5919e1cd2797551856763408d756523ef;hb=a7b46a66b2265d69776ec28d9f643eb4f1506439;hp=1f171722673733c6d5f17a7fcd3cab494d113c44;hpb=7d7ae6aab5fb6307328b7cfb193ebce3e2870624;p=pkg%2Fabook.git

diff --git a/filter.c b/filter.c
index 1f17172..cb52ade 100644
--- a/filter.c
+++ b/filter.c
@@ -916,7 +916,7 @@ pine_fixbuf(char *buf)
 {
 	int i,j;
 
-	for(i=0,j=0; j < (int)strlen(buf); i++, j++)
+	for(i = 0,j = 0; j < (int)strlen(buf); i++, j++)
 		buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
 }
 
@@ -929,15 +929,15 @@ pine_convert_emails(char *s)
 	if(s == NULL || *s != '(')
 		return;
 
-	for(i=0; s[i]; i++ )
-		s[i] = s[i+1];
+	for(i = 0; s[i]; i++)
+		s[i] = s[i + 1];
 
 	if( ( tmp = strchr(s,')')) )
-		*tmp=0;
+		*tmp = '\0';
 
 	for(i = 1; ( tmp = strchr(s, ',') ) != NULL ; i++, s = tmp + 1)
 		if(i > MAX_LIST_ITEMS - 1) {
-			*tmp = 0;
+			*tmp = '\0';
 			break;
 		}
 
@@ -1503,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));
@@ -1511,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))
@@ -1520,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)),
@@ -1530,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");
 
 	}