X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=filter.c;h=d98ad117e3e1406b3a8148691d530586cd74d944;hb=4128f78f5543bebc7cd1868736855207019f1f71;hp=f96d3fdb48015089c9d61fc4ef1e4e68bc4e39fe;hpb=5e99b23942702a191a320e04988117d0c1bc5046;p=pkg%2Fabook.git

diff --git a/filter.c b/filter.c
index f96d3fd..d98ad11 100644
--- a/filter.c
+++ b/filter.c
@@ -12,6 +12,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <pwd.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include "abook_curses.h"
 #include "filter.h"
@@ -193,7 +194,7 @@ import_database()
 	
 	mvaddstr(5+filter, 2, "->");
 	
-	filename = ask_filename("Filename: ", 1);
+	filename = ask_filename("Filename: ");
 	if( !filename ) {
 		refresh_screen();
 		return 2;
@@ -201,8 +202,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 == items )
 		statusline_msg("Hmm.., file seems not to be a valid file");
 	
 	refresh_screen();
@@ -219,7 +219,7 @@ i_read_file(char *filename, int (*func) (FILE *in))
 	FILE *in;
 	int ret = 0;
 
-	if( ( in = fopen( filename, "r" ) ) == NULL )
+	if( ( in = abook_fopen( filename, "r" ) ) == NULL )
 		return 1;
 
 	ret = (*func) (in);
@@ -230,14 +230,15 @@ i_read_file(char *filename, int (*func) (FILE *in))
 }
 
 int
-import(char filtname[FILTNAME_LEN], char *filename)
+import_file(char filtname[FILTNAME_LEN], char *filename)
 {
 	int i;
 	int tmp = items;
 	int ret = 0;
 
 	for(i=0;; i++) {
-		if( ! strncmp(i_filters[i].filtname, filtname, FILTNAME_LEN) )
+		if( ! strncasecmp(i_filters[i].filtname, filtname,
+					FILTNAME_LEN) )
 			break;
 		if( ! *i_filters[i].filtname ) {
 			i = -1;
@@ -248,9 +249,13 @@ import(char filtname[FILTNAME_LEN], char *filename)
 	if( i<0 )
 		return -1;
 
-	if( !strcmp(filename, "-") )
-		ret = (*i_filters[i].func) (stdin);
-	else
+	if( !strcmp(filename, "-") ) {
+		struct stat s;
+		if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode))
+			ret = 1;
+		else
+			ret = (*i_filters[i].func) (stdin);
+	} else
 		ret =  i_read_file(filename, i_filters[i].func);
 	
 	if( tmp == items )
@@ -299,7 +304,7 @@ export_database()
 	
 	filter = getch() - 'a';
 	if(filter == 'x' - 'a' ||
-		filter >= number_of_output_filters(e_filters) || filter < 0) {
+		filter >= number_of_output_filters() || filter < 0) {
 		refresh_screen();
 		return 1;
 	}
@@ -319,7 +324,7 @@ export_database()
 		clear_statusline();
 	}
 	
-	filename = ask_filename("Filename: ", 0);
+	filename = ask_filename("Filename: ");
 	if( !filename ) {
 		refresh_screen();
 		return 2;
@@ -362,7 +367,8 @@ fexport(char filtname[FILTNAME_LEN], FILE *handle, int enum_mode)
 	struct db_enumerator e = init_db_enumerator(enum_mode);
 
 	for(i=0;; i++) {
-		if( ! strncmp(e_filters[i].filtname, filtname, FILTNAME_LEN) )
+		if( ! strncasecmp(e_filters[i].filtname, filtname,
+					FILTNAME_LEN) )
 			break;
 		if( ! *e_filters[i].filtname ) {
 			i = -1;
@@ -376,7 +382,7 @@ fexport(char filtname[FILTNAME_LEN], FILE *handle, int enum_mode)
 	
 
 int
-export(char filtname[FILTNAME_LEN], char *filename)
+export_file(char filtname[FILTNAME_LEN], char *filename)
 {
 	const int mode = ENUM_ALL;
 	int i;
@@ -384,7 +390,8 @@ export(char filtname[FILTNAME_LEN], char *filename)
 	struct db_enumerator e = init_db_enumerator(mode);
 	
 	for(i=0;; i++) {
-		if( ! strncmp(e_filters[i].filtname, filtname, FILTNAME_LEN) )
+		if( ! strncasecmp(e_filters[i].filtname, filtname,
+					FILTNAME_LEN) )
 			break;
 		if( ! *e_filters[i].filtname ) {
 			i = -1;
@@ -415,7 +422,7 @@ export(char filtname[FILTNAME_LEN], char *filename)
 
 static void	ldif_fix_string(char *str);
 
-#define	LDIF_ITEM_FIELDS	15
+#define	LDIF_ITEM_FIELDS	16
 
 typedef char*  ldif_item[LDIF_ITEM_FIELDS];
 
@@ -423,6 +430,7 @@ static ldif_item ldif_field_names = {
 	"cn",	
 	"mail",
 	"streetaddress",
+	"streetaddress2",
         "locality",
 	"st",
 	"postalcode",
@@ -441,6 +449,7 @@ static int ldif_conv_table[LDIF_ITEM_FIELDS] = {
 	NAME,		/* "cn" */
 	EMAIL,		/* "mail" */
 	ADDRESS,	/* "streetaddress" */
+	ADDRESS2,	/* "streetaddress2" */     
         CITY,		/* "locality" */
 	STATE,		/* "st" */
 	ZIP,		/* "postalcode" */
@@ -494,7 +503,7 @@ ldif_read_line(FILE *in)
 		free(line);
 	}
 
-	if( *buf == '#' ) {
+	if(buf && *buf == '#' ) {
 		free(buf);
 		return NULL;
 	}
@@ -585,7 +594,7 @@ ldif_fix_string(char *str)
 {
 	int i, j;
 
-	for( i = 0, j = 0; j < strlen(str); i++, j++)
+	for( i = 0, j = 0; j < (int)strlen(str); i++, j++)
 		str[i] = ( str[j] == (char)0xc3 ?
 				(char) str[++j] + (char) 0x40 :
 				str[j] );
@@ -795,7 +804,7 @@ html_export_database(FILE *out, struct db_enumerator e)
 			    tmp,
 			    database[e.item][NAME] );
 		else
-		    fprintf(out, "<tr>\n<td>%s>\n",
+		    fprintf(out, "<tr>\n<td>%s\n",
 			    database[e.item][NAME] );
 
 		fprintf(out, "<td>%s\n<td>%s\n",
@@ -815,14 +824,13 @@ html_export_write_head(FILE *out, int extra_column)
 {
 	char *realname = get_real_name();
 
-	fprintf(out, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n");
-	fprintf(out, "<html>\n<head>\n	<title>%s's addressbook</title>",
-			realname );
+	fprintf(out, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
+	fprintf(out, "<html>\n<head>\n <title>%s's addressbook</title>", realname );
 	fprintf(out, "\n</head>\n<body>\n");
 	fprintf(out, "\n<h2>%s's addressbook</h2>\n", realname );
 	fprintf(out, "<br><br>\n\n");
 
-	fprintf(out, "<center><table border>\n");
+	fprintf(out, "<table border=\"1\" align=\"center\">\n");
 	fprintf(out, "\n<tr><th>Name<th>E-mail address(es)<th>%s</tr>\n\n",
 			abook_fields[extra_column].name);
 
@@ -832,7 +840,7 @@ html_export_write_head(FILE *out, int extra_column)
 static void
 html_export_write_tail(FILE *out)
 {
-	fprintf(out, "\n</table></center>\n");
+	fprintf(out, "\n</table>\n");
 	fprintf(out, "\n</body>\n</html>\n");
 }
 	
@@ -850,7 +858,7 @@ pine_fixbuf(char *buf)
 {
 	int i,j;
 
-	for(i=0,j=0; j < strlen(buf); i++, j++)
+	for(i=0,j=0; j < (int)strlen(buf); i++, j++)
 		buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
 }
 
@@ -896,7 +904,7 @@ pine_parse_buf(char *buf)
 		len = last ? strlen(start) : (int) (end-start);
 		len = min(len, 400-1);
 	
-		if(i < sizeof(pine_conv_table) / sizeof(*pine_conv_table)
+		if(i < (int)(sizeof(pine_conv_table) / sizeof(*pine_conv_table))
 				&& pine_conv_table[i] >= 0) {
 			strncpy(tmp, start, len);
 			tmp[len] = 0;
@@ -1058,9 +1066,11 @@ csv_store_field(list_item item, char *s, int field)
 	if( !(newstr = csv_remove_quotes(s)) )
 		return;
 
-	if(field < (sizeof(csv_conv_table) / sizeof(*csv_conv_table))
+	if(field < (int)(sizeof(csv_conv_table) / sizeof(*csv_conv_table))
 			&& csv_conv_table[field] >= 0) {
 		item[csv_conv_table[field]] = newstr;
+	} else {
+		my_free(newstr);
 	}
 }
 
@@ -1098,7 +1108,7 @@ csv_parse_line(char *line)
 {
 	char *p, *start;
 	int field;
-	int in_quote = FALSE;
+	bool in_quote = FALSE;
 	list_item item;
 
 	memset(item, 0, sizeof(item));
@@ -1222,8 +1232,9 @@ gcrd_export_database(FILE *out, struct db_enumerator e)
 		free(name);
 
 		if ( database[e.item][ADDRESS] )
-			fprintf(out, "ADR:;;%s;%s;%s;%s;%s\n",
+			fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\n",
 				safe_str(database[e.item][ADDRESS]),
+				safe_str(database[e.item][ADDRESS2]),				
 				safe_str(database[e.item][CITY]),
 				safe_str(database[e.item][STATE]),
 				safe_str(database[e.item][ZIP]),
@@ -1320,7 +1331,10 @@ mutt_alias_export(FILE *out, struct db_enumerator e)
 static void
 text_write_address_us(FILE *out, int i) {
 	fprintf(out, "\n%s", database[i][ADDRESS]);
-	
+
+   	if (database[i][ADDRESS2])
+		fprintf(out, "\n%s", database[i][ADDRESS2]);
+
 	if (database[i][CITY])
 		fprintf(out, "\n%s", database[i][CITY]);
 		
@@ -1354,7 +1368,10 @@ text_write_address_uk(FILE *out, int i) {
 static void
 text_write_address_eu(FILE *out, int i) {
 	fprintf(out, "\n%s", database[i][ADDRESS]);
-	
+
+   	if (database[i][ADDRESS2])
+		fprintf(out, "\n%s", database[i][ADDRESS2]);
+
 	if (database[i][ZIP] || database[i][CITY]) {
 		fputc('\n', out);