X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mymail.c;h=2617d02a71c11603c5d0af165e8053aa0822c682;hb=17557f7799a9b15adab76086f1f22481f1d10bd1;hp=125366a99ae21fa488227970dcef87519ee73427;hpb=9dad01815a424140893ae31a10530c0208c21111;p=mymail.git

diff --git a/mymail.c b/mymail.c
index 125366a..2617d02 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;
@@ -88,12 +88,26 @@ void *safe_malloc(size_t n) {
 
 /*********************************************************************/
 
-void usage(FILE *out) {
+void print_version(FILE *out) {
   fprintf(out, "mymail version %s (%s)\n", VERSION, UNAME);
+}
+
+void print_usage(FILE *out) {
+  print_version(out);
   fprintf(out, "Written by Francois Fleuret <francois@fleuret.org>.\n");
   fprintf(out, "\n");
   fprintf(out, "Usage: mymail [options] [<filename1> [<filename2> ...]]\n");
   fprintf(out, "\n");
+  fprintf(out, " -h, --help\n");
+  fprintf(out, "         show this help\n");
+  fprintf(out, " -v, --version\n");
+  fprintf(out, "         print the version number\n");
+  fprintf(out, " -i, --index\n");
+  fprintf(out, "         index mails\n");
+  fprintf(out, " -d <db filename>, --db-file <db filename>\n");
+  fprintf(out, "         set the data-base file\n");
+  fprintf(out, " -s <search pattern>, --search <search pattern>\n");
+  fprintf(out, "         search for matching mails in the data-base file\n");
 }
 
 /*********************************************************************/
@@ -138,7 +152,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 +199,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 +208,8 @@ void index_mbox(const char *input_filename,
   new_header = 0;
 
   position_in_file = 0;
+  end_of_full_line = 0;
+  full_line[0] = '\0';
 
   while(fgets(raw_line, BUFFER_SIZE, file)) {
     if(strncmp(raw_line, "From ", 5) == 0) {
@@ -307,7 +323,8 @@ enum {
 
 static struct option long_options[] = {
   { "help", no_argument, 0, 'h' },
-  { "db-prefix", 1, 0, 'p' },
+  { "version", no_argument, 0, 'v' },
+  { "db-file", 1, 0, 'd' },
   { "search-pattern", 1, 0, 's' },
   { "index", 0, 0, 'i' },
   { 0, 0, 0, 0 }
@@ -339,7 +356,7 @@ int main(int argc, char **argv) {
 
   setlocale(LC_ALL, "");
 
-  while ((c = getopt_long(argc, argv, "hip:s:",
+  while ((c = getopt_long(argc, argv, "hvip:s:",
                           long_options, NULL)) != -1) {
 
     switch(c) {
@@ -348,12 +365,17 @@ int main(int argc, char **argv) {
       show_help = 1;
       break;
 
+    case 'v':
+      print_version(stdout);
+      break;
+
     case 'i':
       action_index = 1;
       break;
 
     case 'p':
       db_filename = strdup(optarg);
+      /* printf("db_filename=\"%s\"\n", db_filename); */
       break;
 
     case 's':
@@ -371,16 +393,18 @@ 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) {
-    usage(stderr);
+    print_usage(stderr);
     exit(EXIT_FAILURE);
   }
 
   if(show_help) {
-    usage(stdout);
+    print_usage(stdout);
     exit(EXIT_SUCCESS);
   }
 
@@ -432,11 +456,6 @@ int main(int argc, char **argv) {
         exit(EXIT_FAILURE);
       }
 
-      /* printf("Starting search in %s for field \"%s\" matching \"%s\".\n", */
-      /* db_filename, */
-      /* search_name, */
-      /* search_regexp_string); */
-
       db_file = fopen(db_filename, "r");
 
       if(!db_file) {