X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=filter.c;h=e928492e596ffeddc69d0c8c380a73d8978e97b9;hb=7c501d6668c722e4b0200c4303c70fe840a708a9;hp=fd81174bcf102ed6e10db7d81aecf82303dca8f5;hpb=6a914ed14df9e9bca28eaca566ed7894f5491894;p=pkg%2Fabook.git

diff --git a/filter.c b/filter.c
index fd81174..e928492 100644
--- a/filter.c
+++ b/filter.c
@@ -29,7 +29,7 @@
 #include "xmalloc.h"
 #include <assert.h>
 
-#ifdef VFORMAT
+#ifdef HAVE_VFORMAT
 #include "vcard.h"
 #endif
 
@@ -297,7 +297,7 @@ import_file(char filtname[FILTNAME_LEN], char *filename)
 	if(i < 0)
 		return -1;
 
-#ifdef VFORMAT
+#ifdef HAVE_VFORMAT
 	// this is a special case for
 	// libvformat whose API expects a filename
 	if(!strcmp(filtname, "vcard")) {
@@ -547,35 +547,42 @@ static int ldif_conv_table[LDIF_ITEM_FIELDS] = {
 	-1,             /* "objectclass" */ /* this must be the last entry */
 };
 
-
+/*
+  Handles multi-line strings.
+  If a string starts with a space, it's the continuation
+  of the previous line. Thus we need to always read ahead.
+  But for this to work with stdin, we need to stores the next
+  line for later use in case it's not a continuation of the
+  first line.
+ */
 static char *
-ldif_read_line(FILE *in)
+ldif_read_line(FILE *in, char **next_line)
 {
 	char *buf = NULL;
 	char *ptr, *tmp;
-	long pos;
-	int i;
+	char *line;
 
-	for(i = 1;;i++) {
-		char *line;
+	// buf filled with the first line
+	if(!*next_line)
+		buf = getaline(in);
+	else {
+		buf = xstrdup(*next_line);
+		xfree(*next_line);
+	}
 
-		pos = ftell(in);
+	while(!feof(in)) {
+		// if no line already read-ahead.
 		line = getaline(in);
+		if(!line) break;
 
-		if(feof(in) || !line)
-			break;
-
-		if(i == 1) {
-			buf = line;
-			continue;
-		}
-
+		// this is not a continuation of what is already in buf
+		// store it for the next round
 		if(*line != ' ') {
-			fseek(in, pos, SEEK_SET); /* fixme ! */
-			free(line);
+			*next_line = line;
 			break;
 		}
 
+		// starts with ' ': this is the continuation of buf
 		ptr = line;
 		while( *ptr == ' ')
 			ptr++;
@@ -630,16 +637,10 @@ ldif_convert(ldif_item item, char *type, char *value)
 		return;
 	}
 
-	for(i=0; i < LDIF_ITEM_FIELDS; i++) {
-		if(!safe_strcmp(ldif_field_names[i], type) && *value) {
-			if(i == LDIF_ITEM_FIELDS - 1) /* this is a dirty hack */
-				if(safe_strcmp("person", value))
-					break;
-
-			if(item_fget(item, i))
-				free(item_fget(item, i));
-
+	for(i=0; i < LDIF_ITEM_FIELDS - 1; i++) {
+                if(!strcasecmp(ldif_field_names[i], type) && *value) {
 			item_fput(item, i, xstrdup(value));
+			break;
 		}
 	}
 }
@@ -648,6 +649,7 @@ static int
 ldif_parse_file(FILE *handle)
 {
 	char *line = NULL;
+	char *next_line = NULL;
 	char *type, *value;
 	int vlen;
 	ldif_item item;
@@ -655,8 +657,10 @@ ldif_parse_file(FILE *handle)
 	memset(item, 0, sizeof(item));
 
 	do {
-		if( !(line = ldif_read_line(handle)) )
-			continue;
+		line = ldif_read_line(handle, &next_line);
+
+		// EOF or empty lines: continue;
+		if(!line || *line == '\0') continue;
 
 		if(-1 == (str_parse_line(line, &type, &value, &vlen))) {
 			xfree(line);