Update.

diff --git a/mymail.c b/mymail.c
index 241d635..c24c701 100644 (file)
--- a/mymail.c
+++ b/mymail.c
@@ -30,19 +30,15 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <ncurses.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
-#include <termios.h>
-#include <regex.h>
 #include <locale.h>
 #include <getopt.h>
 #include <limits.h>
+#include <dirent.h>
 
-#define VERSION "1.1.7"
+#define VERSION "0.1"
 
 #define BUFFER_SIZE 16384
 
@@ -63,7 +59,6 @@ void *safe_malloc(size_t n) {
 /*********************************************************************/
 
 void usage(FILE *out) {
-
   fprintf(out, "mymail version %s (%s)\n", VERSION, UNAME);
   fprintf(out, "Written by Francois Fleuret <francois@fleuret.org>.\n");
   fprintf(out, "\n");
@@ -71,13 +66,12 @@ void usage(FILE *out) {
   fprintf(out, "\n");
 }
 
-void read_file(const char *input_filename,
-               int nb_lines_max, int *nb_lines) {
+void read_file(const char *input_filename) {
 
   char raw_line[BUFFER_SIZE];
   char *s;
   FILE *file;
-  int l;
+  int in_header;
 
   file = fopen(input_filename, "r");
 
@@ -86,18 +80,71 @@ void read_file(const char *input_filename,
     exit(EXIT_FAILURE);
   }
 
-  while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
-    l = strlen(raw_line);
-    fgets(raw_line + l, BUFFER_SIZE - l, file);
-    for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
-      *s = '\0';
+  in_header = 0;
+
+  while(fgets(raw_line, BUFFER_SIZE, file)) {
+    if(strncmp(raw_line, "From ", 5) == 0) {
+      if(in_header) {
+        fprintf(stderr, "Got a 'From ' in the header.\n");
+        exit(EXIT_FAILURE);
+      }
+      in_header = 1;
+    } else if(strncmp(raw_line, "\n", 1) == 0) {
+      if(in_header) { in_header = 0; }
+    }
+
+    if(in_header) {
+      printf("LINE.H %s", raw_line);
+    } else {
+      printf("LINE.B %s", raw_line);
     }
-    /* store_line(hash_table, raw_line, nb_lines, lines); */
   }
 
   fclose(file);
 }
 
+int ignore_entry(const char *name) {
+  return
+    strcmp(name, ".") == 0 ||
+    strcmp(name, "..") == 0 ||
+    (name[0] == '.' && name[1] != '/');
+}
+
+void process_dir(const char *dir_name) {
+  DIR *dir;
+  struct dirent *dir_e;
+  struct stat sb;
+  char subname[PATH_MAX + 1];
+
+  if(lstat(dir_name, &sb) != 0) {
+    fprintf(stderr, "mymail: Can not stat \"%s\": %s\n", dir_name, strerror(errno));
+    exit(EXIT_FAILURE);
+  } else {
+  }
+
+  if(S_ISLNK(sb.st_mode)) {
+    return;
+  }
+
+  dir = opendir(dir_name);
+
+  if(dir) {
+    printf("Processing directory '%s'.\n", dir_name);
+    while((dir_e = readdir(dir))) {
+      if(!ignore_entry(dir_e->d_name)) {
+        snprintf(subname, PATH_MAX, "%s/%s", dir_name, dir_e->d_name);
+        process_dir(subname);
+      }
+    }
+    closedir(dir);
+  } else {
+    if(S_ISREG(sb.st_mode)) {
+      printf("Processing regular file '%s'.\n", dir_name);
+      read_file(dir_name);
+    }
+  }
+}
+
 /*********************************************************************/
 
 /* For long options that have no equivalent short option, use a
@@ -143,5 +190,10 @@ int main(int argc, char **argv) {
     exit(EXIT_SUCCESS);
   }
 
+  while(optind < argc) {
+    process_dir(argv[optind]);
+    optind++;
+  }
+
   exit(EXIT_SUCCESS);
 }