X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;ds=sidebyside;f=filter.c;h=c681af62a84b7d6621fb820a008bf8ff41abe113;hb=978de1f80f0d0ac1dfee83a8f6cb4cb89220e32a;hp=15370fbf7d606ae64e6043b5a990e9baf4e77d5d;hpb=c0217523d30a32c86e495066655a5c528f5cc772;p=pkg%2Fabook.git
diff --git a/filter.c b/filter.c
index 15370fb..c681af6 100644
--- a/filter.c
+++ b/filter.c
@@ -820,10 +820,14 @@ html_export_database(FILE *out, struct db_enumerator e)
db_enumerate_items(e) {
get_first_email(tmp, e.item);
- fprintf(out, "
\n%s\n",
- tmp,
- database[e.item][NAME] );
-
+ if (*tmp)
+ fprintf(out, " |
\n%s\n",
+ tmp,
+ database[e.item][NAME] );
+ else
+ fprintf(out, " |
\n%s>\n",
+ database[e.item][NAME] );
+
fprintf(out, " | %s\n | %s\n",
database[e.item][EMAIL],
safe_str(database[e.item][extra_column]) );
@@ -896,7 +900,7 @@ pine_convert_emails(char *s)
*tmp=0;
for(i=1; ( tmp = strchr(s, ',') ) != NULL ; i++, s=tmp+1 )
- if( i > 3 ) {
+ if( i > MAX_EMAILS - 1 ) {
*tmp = 0;
break;
}
@@ -950,7 +954,7 @@ pine_parse_file(FILE *in)
while(!feof(in)) {
for(i=2;;i++) {
- buf = realloc(buf, i*LINESIZE);
+ buf = (char *) realloc(buf, i*LINESIZE);
if(i==2)
strcpy(buf, line);
fgets(line, LINESIZE, in);
@@ -962,8 +966,10 @@ pine_parse_file(FILE *in)
strcat(buf, ptr);
}
- if( *buf == '#' )
+ if( *buf == '#' ) {
+ my_free(buf);
continue;
+ }
pine_fixbuf(buf);
pine_parse_buf(buf);
@@ -1218,14 +1224,8 @@ text_write_address_eu(FILE *out, int i) {
if(database[i][CITY])
fprintf(out, "%s", database[i][CITY]);
- /*
- fprintf(out, "\n%s %s",
- safe_str(database[i][ZIP]),
- safe_str(database[i] [CITY]));
- */
}
-
if (database[i][STATE])
fprintf(out, "\n%s", database[i][STATE]);
|