X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=filter.c;h=08f49b069b538d962257b8857a4946643ab11923;hb=264e355b51481b3c64f095453a61161900d2f12a;hp=4a537b946de43d08a9a2892f7381f3a150a8b64f;hpb=42b63bdef9bec780253f214fa2c7d0b5ce484725;p=pkg%2Fabook.git

diff --git a/filter.c b/filter.c
index 4a537b9..08f49b0 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);
@@ -249,9 +249,13 @@ import_file(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 )
@@ -320,7 +324,7 @@ export_database()
 		clear_statusline();
 	}
 	
-	filename = ask_filename("Filename: ", 0);
+	filename = ask_filename("Filename: ");
 	if( !filename ) {
 		refresh_screen();
 		return 2;
@@ -499,7 +503,7 @@ ldif_read_line(FILE *in)
 		free(line);
 	}
 
-	if( *buf == '#' ) {
+	if(buf && *buf == '#' ) {
 		free(buf);
 		return NULL;
 	}
@@ -779,11 +783,12 @@ ldif_export_database(FILE *out, struct db_enumerator e)
 static void            html_export_write_head(FILE *out, int extra_column);
 static void            html_export_write_tail(FILE *out);
 
+extern int extra_column;
+
 static int
 html_export_database(FILE *out, struct db_enumerator e)
 {
 	char tmp[MAX_EMAILSTR_LEN];
-	int extra_column = options_get_int("extra_column");
 
 	if( items < 1 )
 		return 2;
@@ -1394,7 +1399,7 @@ text_export_database(FILE * out, struct db_enumerator e)
 	char emails[MAX_EMAILS][MAX_EMAIL_LEN];
 	int j;
 	char *realname = get_real_name();
-	char *style = options_get_str("address_style");
+	char *style = opt_get_str(STR_ADDRESS_STYLE);
 
 	fprintf(out,
 		"-----------------------------------------\n%s's address book\n"