From: Francois Fleuret Date: Mon, 28 Jan 2013 15:11:12 +0000 (+0100) Subject: Now uses the environment variable MYMAIL_DB_FILE. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=b0bc71a636e5c43262dc7a1cb99ce4cdb92d2286;p=mymail.git Now uses the environment variable MYMAIL_DB_FILE. --- diff --git a/mymail.c b/mymail.c index 125366a..001d14d 100644 --- a/mymail.c +++ b/mymail.c @@ -46,7 +46,7 @@ #define VERSION "0.1" -#define BUFFER_SIZE 16384 +#define BUFFER_SIZE 65536 struct parsable_field { char *name; @@ -138,7 +138,7 @@ void search_in_db(const char *search_name, const char *search_regexp_string, FILE *mail_file; mail_file = fopen(current_mail_filename, "r"); if(!mail_file) { - fprintf(stderr, "mymail: Can not open `%s'.\n", current_mail_filename); + fprintf(stderr, "mymail: Can not open '%s'.\n", current_mail_filename); exit(EXIT_FAILURE); } fseek(mail_file, current_position_in_mail, SEEK_SET); @@ -185,7 +185,7 @@ void index_mbox(const char *input_filename, file = fopen(input_filename, "r"); if(!file) { - fprintf(stderr, "mymail: Can not open `%s'.\n", input_filename); + fprintf(stderr, "mymail: Can not open '%s'.\n", input_filename); if(paranoid) { exit(EXIT_FAILURE); } return; } @@ -194,6 +194,7 @@ void index_mbox(const char *input_filename, new_header = 0; position_in_file = 0; + end_of_full_line = 0; while(fgets(raw_line, BUFFER_SIZE, file)) { if(strncmp(raw_line, "From ", 5) == 0) { @@ -307,7 +308,7 @@ enum { static struct option long_options[] = { { "help", no_argument, 0, 'h' }, - { "db-prefix", 1, 0, 'p' }, + { "db-file", 1, 0, 'p' }, { "search-pattern", 1, 0, 's' }, { "index", 0, 0, 'i' }, { 0, 0, 0, 0 } @@ -354,6 +355,7 @@ int main(int argc, char **argv) { case 'p': db_filename = strdup(optarg); + printf("db_filename=\"%s\"\n", db_filename); break; case 's': @@ -371,7 +373,9 @@ int main(int argc, char **argv) { } if(!db_filename) { - db_filename = strdup("/tmp/mymail"); + char *default_db_filename = getenv("MYMAIL_DB_FILE"); + if(!default_db_filename) { default_db_filename = "/tmp/mymail.db"; } + db_filename = strdup(default_db_filename); } if(error) {