projects
/
mymail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the --use-leading-time option.
[mymail.git]
/
mymail.c
diff --git
a/mymail.c
b/mymail.c
index
20d0419
..
e078bf6
100644
(file)
--- a/
mymail.c
+++ b/
mymail.c
@@
-25,7
+25,7
@@
directories containing mbox files, and create a db file containing
for each mail a list of fields computed from the header, or (2)
read such a db file and get all the mails matching regexp-defined
directories containing mbox files, and create a db file containing
for each mail a list of fields computed from the header, or (2)
read such a db file and get all the mails matching regexp-defined
- conditions on the fields.
+ conditions on the fields
, to create a resulting mbox file
.
It is low-tech, simple, light and fast.
It is low-tech, simple, light and fast.
@@
-46,26
+46,21
@@
#include <time.h>
#define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file"
#include <time.h>
#define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file"
-#define VERSION "0.9.
1
"
+#define VERSION "0.9.
5
"
-#define MAX_NB_SEARCH_CONDITIONS
10
+#define MAX_NB_SEARCH_CONDITIONS
32
#define BUFFER_SIZE 65536
#define TOKEN_BUFFER_SIZE 1024
#define BUFFER_SIZE 65536
#define TOKEN_BUFFER_SIZE 1024
-regex_t leading_from_line_regexp;
+#define LEADING_FROM_LINE_REGEXP_STRING "^From [^ ]* \\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\) \\(Jan\\|Feb\\|Mar\\|Apr\\|May\\|Jun\\|Jul\\|Aug\\|Sep\\|Oct\\|Nov\\|Dec\\) [ 123][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]\n$"
-char *db_filename;
-char *db_filename_regexp_string;
-char *db_root_path;
-char *db_filename_list;
-char output_filename[PATH_MAX + 1];
+/* Global variables! */
-int paranoid;
-int action_index;
-int quiet;
+int global_quiet;
+int global_use_leading_time;
-
time_t being_today
;
+
regex_t global_leading_from_line_regexp
;
/********************************************************************/
/********************************************************************/
@@
-82,7
+77,7
@@
enum {
MAX_ID
};
MAX_ID
};
-static char *field_
name
s[] = {
+static char *field_
key
s[] = {
"mail",
"lead",
"from",
"mail",
"lead",
"from",
@@
-107,6
+102,7
@@
struct search_condition {
struct parsable_field {
int id;
struct parsable_field {
int id;
+ int cflags;
char *regexp_string;
regex_t regexp;
};
char *regexp_string;
regex_t regexp;
};
@@
-114,31
+110,36
@@
struct parsable_field {
static struct parsable_field fields_to_parse[] = {
{
ID_LEADING_LINE,
static struct parsable_field fields_to_parse[] = {
{
ID_LEADING_LINE,
+ 0,
"^From ",
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{
ID_FROM,
"^From ",
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{
ID_FROM,
- "^\\([Ff][Rr][Oo][Mm]:\\|[Rr][Ee][Pp][Ll][Yy]-[Tt][Oo]:\\|[Ss][Ee][Nn][Dd][Ee][Rr]:\\)",
+ REG_ICASE,
+ "^\\(from\\|reply-to\\|sender\\|return-path\\): ",
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{
ID_TO,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{
ID_TO,
- "^\\([Tt][Oo]\\|[Cc][Cc]\\|[Bb][Cc][Cc]\\): ",
+ REG_ICASE,
+ "^\\(to\\|cc\\|bcc\\): ",
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{
ID_SUBJECT,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{
ID_SUBJECT,
- "^[Ss][Uu][Bb][Jj][Ee][Cc][Tt]: ",
+ REG_ICASE,
+ "^subject: ",
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{
ID_DATE,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{
ID_DATE,
- "^[Dd][Aa][Tt][Ee]: ",
+ REG_ICASE,
+ "^date: ",
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
@@
-150,35
+151,46
@@
int xor(int a, int b) {
return (a && !b) || (!a && b);
}
return (a && !b) || (!a && b);
}
-char *parse_token(char *token_buffer, size_t token_buffer_size,
-
char separator,
char *string) {
+c
onst c
har *parse_token(char *token_buffer, size_t token_buffer_size,
+
char separator, const
char *string) {
char *u = token_buffer;
char *u = token_buffer;
+ while(*string == separator) { string++; }
while(u < token_buffer + token_buffer_size - 1 && *string &&
*string != separator) {
*(u++) = *(string++);
}
while(u < token_buffer + token_buffer_size - 1 && *string &&
*string != separator) {
*(u++) = *(string++);
}
- while(*string == separator)
string++;
+ while(*string == separator)
{ string++; }
*u = '\0';
return string;
}
*u = '\0';
return string;
}
-void remove_eof(char *c) {
- while(*c && *c != '\n' && *c != '\r') c++;
- *c = '\0';
+char *default_value(char *current_value,
+ const char *env_variable,
+ const char *hard_default_value) {
+ if(current_value) {
+ return current_value;
+ } else {
+ char *env_value = getenv(env_variable);
+ if(env_value) {
+ return strdup(env_value);
+ } else if(hard_default_value) {
+ return strdup(hard_default_value);
+ } else {
+ return 0;
+ }
+ }
}
}
-/********************************************************************/
-
-/* malloc with error checking. */
-
-void *safe_malloc(size_t n) {
- void *p = malloc(n);
- if(!p && n != 0) {
+FILE *safe_fopen(const char *path, const char *mode, const char *comment) {
+ FILE *result = fopen(path, mode);
+ if(result) {
+ return result;
+ } else {
fprintf(stderr,
fprintf(stderr,
- "mymail: cannot allocate memory: %s\n", strerror(errno));
+ "mymail: Cannot open file '%s' (%s) with mode \"%s\".\n",
+ path, comment, mode);
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
- return p;
}
/*********************************************************************/
}
/*********************************************************************/
@@
-199,67
+211,73
@@
void print_usage(FILE *out) {
fprintf(out, " print the version number\n");
fprintf(out, " -q, --quiet\n");
fprintf(out, " do not print information during search\n");
fprintf(out, " print the version number\n");
fprintf(out, " -q, --quiet\n");
fprintf(out, " do not print information during search\n");
+ fprintf(out, " -t, --use-leading-time\n");
+ fprintf(out, " use the time stamp from the leading line of each mail and not the Date:\n");
+ fprintf(out, " field\n");
fprintf(out, " -p <db filename pattern>, --db-pattern <db filename pattern>\n");
fprintf(out, " set the db filename pattern for recursive search\n");
fprintf(out, " -r <db root path>, --db-root <db root path>\n");
fprintf(out, " set the db root path for recursive search\n");
fprintf(out, " -l <db filename list>, --db-list <db filename list>\n");
fprintf(out, " set the semicolon-separated list of db files for search\n");
fprintf(out, " -p <db filename pattern>, --db-pattern <db filename pattern>\n");
fprintf(out, " set the db filename pattern for recursive search\n");
fprintf(out, " -r <db root path>, --db-root <db root path>\n");
fprintf(out, " set the db root path for recursive search\n");
fprintf(out, " -l <db filename list>, --db-list <db filename list>\n");
fprintf(out, " set the semicolon-separated list of db files for search\n");
+ fprintf(out, " -m <mbox filename pattern>, --mbox-pattern <mbox filename pattern>\n");
+ fprintf(out, " set the mbox filename pattern for recursive search\n");
fprintf(out, " -s <search pattern>, --search <search pattern>\n");
fprintf(out, " search for matching mails in the db file\n");
fprintf(out, " -s <search pattern>, --search <search pattern>\n");
fprintf(out, " search for matching mails in the db file\n");
- fprintf(out, " -d <db filename>, --db-file <db filename>\n");
+ fprintf(out, " -d <db filename>, --db-file
-generate
<db filename>\n");
fprintf(out, " set the db filename for indexing\n");
fprintf(out, " -i, --index\n");
fprintf(out, " index mails\n");
fprintf(out, " -o <output filename>, --output <output filename>\n");
fprintf(out, " set the result file, use stdout if unset\n");
fprintf(out, " set the db filename for indexing\n");
fprintf(out, " -i, --index\n");
fprintf(out, " index mails\n");
fprintf(out, " -o <output filename>, --output <output filename>\n");
fprintf(out, " set the result file, use stdout if unset\n");
-}
-
-/*********************************************************************/
-
-time_t time_for_past_day(int day) {
- time_t t;
- struct tm *tm;
- int delta_day;
- t = time(0);
- tm = localtime(&t);
- delta_day = (7 + tm->tm_wday - day) % 7 + 1;
- return t - delta_day * 3600 * 24 + tm->tm_sec + 60 * tm->tm_min + 3600 * tm->tm_hour;
+ fprintf(out, " -a <search field>, --default-search <search field>\n");
+ fprintf(out, " set the default search field\n");
}
/*********************************************************************/
int ignore_entry(const char *name) {
return
}
/*********************************************************************/
int ignore_entry(const char *name) {
return
- /* strcmp(name, ".") == 0 || */
- /* strcmp(name, "..") == 0 || */
+ strcmp(name, ".") == 0 ||
+ strcmp(name, "..") == 0 ||
(name[0] == '.' && name[1] != '/');
}
(name[0] == '.' && name[1] != '/');
}
-int is_a_leading_from_line(char *s) {
- return strncmp(s, "From ", 5) == 0 &&
- regexec(&leading_from_line_regexp, s, 0, 0, 0) == 0;
+int is_a_leading_from_line(char *mbox_line) {
+ return
+ strncmp(mbox_line, "From ", 5) == 0 &&
+ regexec(&global_leading_from_line_regexp, mbox_line, 0, 0, 0) == 0;
}
int mbox_line_match_search(struct search_condition *condition,
}
int mbox_line_match_search(struct search_condition *condition,
- int mbox_id, char *mbox_value) {
+ int mbox_id, c
onst c
har *mbox_value) {
if(condition->field_id == ID_INTERVAL) {
if(condition->field_id == ID_INTERVAL) {
- if(mbox_id == ID_LEADING_LINE) {
- char *c;
- time_t t;
- struct tm tm;
-
- c = mbox_value;
- while(*c && *c != ' ') c++; while(*c && *c == ' ') c++;
- strptime(c, "%a %b %e %k:%M:%S %Y", &tm);
- t = mktime(&tm);
-
- return (t >= condition->interval_start &&
- (condition->interval_stop == 0 ||
- t <= condition->interval_stop));
+ const char *c;
+ time_t t;
+ struct tm tm;
+ if(global_use_leading_time) {
+ if(mbox_id == ID_LEADING_LINE) {
+ c = mbox_value;
+ while(*c && *c != ' ') c++; while(*c && *c == ' ') c++;
+ strptime(c, "%a %b %e %k:%M:%S %Y", &tm);
+ t = mktime(&tm);
+ return (t >= condition->interval_start &&
+ (condition->interval_stop == 0 ||
+ t <= condition->interval_stop));
+ } else {
+ return 0;
+ }
} else {
} else {
- return 0;
+ if(mbox_id == ID_DATE) {
+ strptime(mbox_value, "%a, %d %b %Y %k:%M:%S", &tm);
+ t = mktime(&tm);
+ return (t >= condition->interval_start &&
+ (condition->interval_stop == 0 ||
+ t <= condition->interval_stop));
+ } else {
+ return 0;
+ }
}
} else {
return
}
} else {
return
@@
-277,7
+295,9
@@
int mbox_line_match_search(struct search_condition *condition,
(condition->field_id == ID_FROM && mbox_id == ID_LEADING_LINE)
)
(condition->field_id == ID_FROM && mbox_id == ID_LEADING_LINE)
)
+
&&
&&
+
regexec(&condition->regexp, mbox_value, 0, 0, 0) == 0;
}
}
regexec(&condition->regexp, mbox_value, 0, 0, 0) == 0;
}
}
@@
-288,29
+308,22
@@
void update_body_hits(char *mail_filename, int position_in_mail,
int *hits) {
FILE *mail_file;
int header, n;
int *hits) {
FILE *mail_file;
int header, n;
- int last_mbox_line_was_empty;
char raw_mbox_line[BUFFER_SIZE];
int nb_body_hits;
nb_body_hits = 0;
header = 1;
char raw_mbox_line[BUFFER_SIZE];
int nb_body_hits;
nb_body_hits = 0;
header = 1;
- mail_file = fopen(mail_filename, "r");
-
- if(!mail_file) {
- fprintf(stderr,
- "mymail: Cannot open mbox '%s' for body scan.\n",
- mail_filename);
- exit(EXIT_FAILURE);
- }
+ mail_file = safe_fopen(mail_filename, "r", "mbox for body scan");
fseek(mail_file, position_in_mail, SEEK_SET);
if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) {
while(nb_body_hits < nb_body_conditions) {
fseek(mail_file, position_in_mail, SEEK_SET);
if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) {
while(nb_body_hits < nb_body_conditions) {
- last_mbox_line_was_empty = (raw_mbox_line[0] == '\n');
+ /* last_mbox_line_was_empty = (raw_mbox_line[0] == '\n'); */
+ /* if(last_mbox_line_was_empty) { header = 0; } */
- if(
last_mbox_line_was_empty
) { header = 0; }
+ if(
raw_mbox_line[0] == '\n'
) { header = 0; }
if(!header) {
for(n = 0; n < nb_search_conditions; n++) {
if(!header) {
for(n = 0; n < nb_search_conditions; n++) {
@@
-325,46
+338,63
@@
void update_body_hits(char *mail_filename, int position_in_mail,
}
if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) ||
}
if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) ||
- (last_mbox_line_was_empty &&
- is_a_leading_from_line(raw_mbox_line)))
+ (is_a_leading_from_line(raw_mbox_line)))
+ break;
+ }
+ }
+
+ fclose(mail_file);
+}
+
+void extract_mail(const char *mail_filename, unsigned long int position_in_mail,
+ FILE *output_file) {
+ char raw_mbox_line[BUFFER_SIZE];
+ FILE *mail_file;
+
+ mail_file = safe_fopen(mail_filename, "r", "mbox for mail extraction");
+ fseek(mail_file, position_in_mail, SEEK_SET);
+
+ if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) {
+ fprintf(output_file, "%s", raw_mbox_line);
+ while(1) {
+ if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) ||
+ (is_a_leading_from_line(raw_mbox_line))
+ )
break;
break;
+ fprintf(output_file, "%s", raw_mbox_line);
}
}
fclose(mail_file);
}
}
}
fclose(mail_file);
}
-
void
search_in_db(const char *db_filename,
-
int nb_search_conditions,
-
struct search_condition *search_conditions,
-
FILE *output_file) {
+
int
search_in_db(const char *db_filename,
+ int nb_search_conditions,
+ struct search_condition *search_conditions,
+ FILE *output_file) {
int hits[MAX_NB_SEARCH_CONDITIONS];
char raw_db_line[BUFFER_SIZE];
int hits[MAX_NB_SEARCH_CONDITIONS];
char raw_db_line[BUFFER_SIZE];
- char raw_mbox_line[BUFFER_SIZE];
char current_mail_filename[PATH_MAX + 1];
unsigned long int current_position_in_mail;
char current_mail_filename[PATH_MAX + 1];
unsigned long int current_position_in_mail;
- char mbox_name[TOKEN_BUFFER_SIZE], *mbox_value;
+ char mbox_key[TOKEN_BUFFER_SIZE];
+ const char *mbox_value;
int mbox_id;
int already_written, m, n;
int mbox_id;
int already_written, m, n;
- int last_mbox_line_was_empty;
int nb_body_conditions, nb_fulfilled_body_conditions;
FILE *db_file;
int nb_body_conditions, nb_fulfilled_body_conditions;
FILE *db_file;
+ int nb_extracted_mails;
+
+ nb_extracted_mails = 0;
- if(!quiet) {
+ if(!
global_
quiet) {
printf("Searching in '%s' ... ", db_filename);
fflush(stdout);
}
printf("Searching in '%s' ... ", db_filename);
fflush(stdout);
}
- db_file =
fopen(db_filename, "r
");
+ db_file =
safe_fopen(db_filename, "r", "index file for search
");
- if(!db_file) {
- fprintf(stderr,
- "mymail: Cannot open \"%s\" for reading: %s\n",
- db_filename,
- strerror(errno));
- exit(EXIT_FAILURE);
- }
+ /* First, check the db file leading line integrity */
if(fgets(raw_db_line, BUFFER_SIZE, db_file)) {
if(strncmp(raw_db_line, MYMAIL_DB_MAGIC_TOKEN, strlen(MYMAIL_DB_MAGIC_TOKEN))) {
if(fgets(raw_db_line, BUFFER_SIZE, db_file)) {
if(strncmp(raw_db_line, MYMAIL_DB_MAGIC_TOKEN, strlen(MYMAIL_DB_MAGIC_TOKEN))) {
@@
-380,6
+410,8
@@
void search_in_db(const char *db_filename,
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
+ /* Then parse the said db file */
+
current_position_in_mail = 0;
already_written = 0;
current_position_in_mail = 0;
already_written = 0;
@@
-395,9
+427,9
@@
void search_in_db(const char *db_filename,
strcpy(current_mail_filename, "");
while(fgets(raw_db_line, BUFFER_SIZE, db_file)) {
strcpy(current_mail_filename, "");
while(fgets(raw_db_line, BUFFER_SIZE, db_file)) {
- mbox_value = parse_token(mbox_
name
, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
+ mbox_value = parse_token(mbox_
key
, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
- if(strcmp("mail", mbox_
name
) == 0) {
+ if(strcmp("mail", mbox_
key
) == 0) {
char position_in_file_string[TOKEN_BUFFER_SIZE];
if(current_mail_filename[0]) {
char position_in_file_string[TOKEN_BUFFER_SIZE];
if(current_mail_filename[0]) {
@@
-410,54
+442,27
@@
void search_in_db(const char *db_filename,
if(n == nb_search_conditions) {
if(n == nb_search_conditions) {
- /* all conditions but the body ones are fine, check the body
- ones */
+ /* Now check the body ones */
+
+ nb_fulfilled_body_conditions = 0;
if(nb_body_conditions > 0) {
update_body_hits(current_mail_filename, current_position_in_mail,
nb_search_conditions, search_conditions,
nb_body_conditions,
hits);
if(nb_body_conditions > 0) {
update_body_hits(current_mail_filename, current_position_in_mail,
nb_search_conditions, search_conditions,
nb_body_conditions,
hits);
- }
-
- nb_fulfilled_body_conditions = 0;
- for(n = 0; n < nb_search_conditions; n++) {
- if(search_conditions[n].field_id == ID_BODY &&
- xor(hits[n], search_conditions[n].negation)) {
- nb_fulfilled_body_conditions++;
+ for(n = 0; n < nb_search_conditions; n++) {
+ if(search_conditions[n].field_id == ID_BODY &&
+ xor(hits[n], search_conditions[n].negation)) {
+ nb_fulfilled_body_conditions++;
+ }
}
}
if(nb_body_conditions == nb_fulfilled_body_conditions) {
}
}
if(nb_body_conditions == nb_fulfilled_body_conditions) {
- FILE *mail_file;
-
- mail_file = fopen(current_mail_filename, "r");
-
- if(!mail_file) {
- fprintf(stderr,
- "mymail: Cannot open mbox '%s' for mail extraction.\n",
- current_mail_filename);
- exit(EXIT_FAILURE);
- }
-
- fseek(mail_file, current_position_in_mail, SEEK_SET);
-
- if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) {
- last_mbox_line_was_empty = 0;
- fprintf(output_file, "%s", raw_mbox_line);
- while(1) {
- if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) ||
- (last_mbox_line_was_empty &&
- is_a_leading_from_line(raw_mbox_line))
- )
- break;
- last_mbox_line_was_empty = (raw_mbox_line[0] == '\n');
- fprintf(output_file, "%s", raw_mbox_line);
- }
- }
-
- fclose(mail_file);
+ nb_extracted_mails++;
+ extract_mail(current_mail_filename, current_position_in_mail, output_file);
}
}
}
}
}
}
@@
-465,16
+470,15
@@
void search_in_db(const char *db_filename,
for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; }
mbox_value = parse_token(position_in_file_string, TOKEN_BUFFER_SIZE, ' ', mbox_value);
for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; }
mbox_value = parse_token(position_in_file_string, TOKEN_BUFFER_SIZE, ' ', mbox_value);
- mbox_value = parse_token(current_mail_filename, TOKEN_BUFFER_SIZE, '
', mbox_value);
+ mbox_value = parse_token(current_mail_filename, TOKEN_BUFFER_SIZE, '
\n
', mbox_value);
current_position_in_mail = atol(position_in_file_string);
current_position_in_mail = atol(position_in_file_string);
- remove_eof(current_mail_filename);
already_written = 0;
}
else {
mbox_id = -1;
for(m = 0; (m < MAX_ID) && mbox_id == -1; m++) {
already_written = 0;
}
else {
mbox_id = -1;
for(m = 0; (m < MAX_ID) && mbox_id == -1; m++) {
- if(strncmp(field_
names[m], mbox_name, strlen(mbox_name
)) == 0) {
+ if(strncmp(field_
keys[m], mbox_key, strlen(mbox_key
)) == 0) {
mbox_id = m;
}
}
mbox_id = m;
}
}
@@
-487,20
+491,23
@@
void search_in_db(const char *db_filename,
fclose(db_file);
fclose(db_file);
- if(!quiet) {
+ if(!
global_
quiet) {
printf("done.\n");
fflush(stdout);
}
printf("done.\n");
fflush(stdout);
}
+
+ return nb_extracted_mails;
}
}
-
void
recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp,
-
int nb_search_conditions,
-
struct search_condition *search_conditions,
-
FILE *output_file) {
+
int
recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp,
+ int nb_search_conditions,
+ struct search_condition *search_conditions,
+ FILE *output_file) {
DIR *dir;
struct dirent *dir_e;
struct stat sb;
char subname[PATH_MAX + 1];
DIR *dir;
struct dirent *dir_e;
struct stat sb;
char subname[PATH_MAX + 1];
+ int nb_extracted_mails = 0;
if(lstat(entry_name, &sb) != 0) {
fprintf(stderr,
if(lstat(entry_name, &sb) != 0) {
fprintf(stderr,
@@
-510,15
+517,17
@@
void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp,
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
+ /* printf("recursive_search_in_db %s\n", entry_name); */
+
dir = opendir(entry_name);
if(dir) {
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name);
dir = opendir(entry_name);
if(dir) {
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name);
- recursive_search_in_db(subname, db_filename_regexp,
- nb_search_conditions, search_conditions,
- output_file);
+
nb_extracted_mails +=
recursive_search_in_db(subname, db_filename_regexp,
+
nb_search_conditions, search_conditions,
+
output_file);
}
}
closedir(dir);
}
}
closedir(dir);
@@
-529,21
+538,25
@@
void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp,
while(*s) { if(*s == '/') { filename = s+1; } s++; }
if(regexec(db_filename_regexp, filename, 0, 0, 0) == 0) {
while(*s) { if(*s == '/') { filename = s+1; } s++; }
if(regexec(db_filename_regexp, filename, 0, 0, 0) == 0) {
- search_in_db(entry_name, nb_search_conditions, search_conditions, output_file);
+ nb_extracted_mails +=
+ search_in_db(entry_name, nb_search_conditions, search_conditions, output_file);
}
}
}
}
+
+ return nb_extracted_mails;
}
/*********************************************************************/
}
/*********************************************************************/
-void index_one_mbox_line(int nb_fields_to_parse, struct parsable_field *fields_to_parse,
+void index_one_mbox_line(unsigned int nb_fields_to_parse,
+ struct parsable_field *fields_to_parse,
char *raw_mbox_line, FILE *db_file) {
regmatch_t matches;
char *raw_mbox_line, FILE *db_file) {
regmatch_t matches;
- int f;
+
unsigned
int f;
for(f = 0; f < nb_fields_to_parse; f++) {
if(regexec(&fields_to_parse[f].regexp, raw_mbox_line, 1, &matches, 0) == 0) {
fprintf(db_file, "%s %s\n",
for(f = 0; f < nb_fields_to_parse; f++) {
if(regexec(&fields_to_parse[f].regexp, raw_mbox_line, 1, &matches, 0) == 0) {
fprintf(db_file, "%s %s\n",
- field_
name
s[fields_to_parse[f].id],
+ field_
key
s[fields_to_parse[f].id],
raw_mbox_line + matches.rm_eo);
}
}
raw_mbox_line + matches.rm_eo);
}
}
@@
-555,16
+568,10
@@
void index_mbox(const char *mbox_filename,
char raw_mbox_line[BUFFER_SIZE], full_line[BUFFER_SIZE];
char *end_of_full_line;
FILE *file;
char raw_mbox_line[BUFFER_SIZE], full_line[BUFFER_SIZE];
char *end_of_full_line;
FILE *file;
- int in_header, new_header
, last_mbox_line_was_empty
;
+ int in_header, new_header;
unsigned long int position_in_file;
unsigned long int position_in_file;
- file = fopen(mbox_filename, "r");
-
- if(!file) {
- fprintf(stderr, "mymail: Cannot open '%s'.\n", mbox_filename);
- if(paranoid) { exit(EXIT_FAILURE); }
- return;
- }
+ file = safe_fopen(mbox_filename, "r", "mbox for indexing");
in_header = 0;
new_header = 0;
in_header = 0;
new_header = 0;
@@
-572,26
+579,34
@@
void index_mbox(const char *mbox_filename,
position_in_file = 0;
end_of_full_line = 0;
full_line[0] = '\0';
position_in_file = 0;
end_of_full_line = 0;
full_line[0] = '\0';
- last_mbox_line_was_empty = 1;
while(fgets(raw_mbox_line, BUFFER_SIZE, file)) {
while(fgets(raw_mbox_line, BUFFER_SIZE, file)) {
- if(
last_mbox_line_was_empty &&
- is_a_leading_from_line(raw_mbox_line)) {
+ if(
is_a_leading_from_line(raw_mbox_line)) {
+ /* This starts a new mail */
if(in_header) {
fprintf(stderr,
"Got a ^\"From \" in the header in %s:%lu.\n",
mbox_filename, position_in_file);
fprintf(stderr, "%s", raw_mbox_line);
if(in_header) {
fprintf(stderr,
"Got a ^\"From \" in the header in %s:%lu.\n",
mbox_filename, position_in_file);
fprintf(stderr, "%s", raw_mbox_line);
- if(paranoid) { exit(EXIT_FAILURE); }
}
}
+
+ /* printf("LEADING_LINE %s", raw_mbox_line); */
+
in_header = 1;
new_header = 1;
} else if(raw_mbox_line[0] == '\n') {
in_header = 1;
new_header = 1;
} else if(raw_mbox_line[0] == '\n') {
- if(in_header) { in_header = 0; }
+ if(in_header) {
+ in_header = 0;
+ /* We leave the header, index the current line */
+ if(full_line[0]) {
+ /* printf("INDEX %s\n", full_line); */
+ index_one_mbox_line(nb_fields_to_parse, fields_to_parse, full_line, db_file);
+ }
+ end_of_full_line = full_line;
+ *end_of_full_line = '\0';
+ }
}
}
- last_mbox_line_was_empty = (raw_mbox_line[0] == '\n');
-
if(in_header) {
if(new_header) {
fprintf(db_file, "mail %lu %s\n", position_in_file, mbox_filename);
if(in_header) {
if(new_header) {
fprintf(db_file, "mail %lu %s\n", position_in_file, mbox_filename);
@@
-599,6
+614,7
@@
void index_mbox(const char *mbox_filename,
}
if(raw_mbox_line[0] == ' ' || raw_mbox_line[0] == '\t') {
}
if(raw_mbox_line[0] == ' ' || raw_mbox_line[0] == '\t') {
+ /* Continuation of a line */
char *start = raw_mbox_line;
while(*start == ' ' || *start == '\t') start++;
*(end_of_full_line++) = ' ';
char *start = raw_mbox_line;
while(*start == ' ' || *start == '\t') start++;
*(end_of_full_line++) = ' ';
@@
-610,17
+626,10
@@
void index_mbox(const char *mbox_filename,
}
else {
}
else {
- /*
- if(!((raw_mbox_line[0] >= 'a' && raw_mbox_line[0] <= 'z') ||
- (raw_mbox_line[0] >= 'A' && raw_mbox_line[0] <= 'Z'))) {
- fprintf(stderr,
- "Header line syntax error %s:%lu.\n",
- mbox_filename, position_in_file);
- fprintf(stderr, "%s", raw_mbox_line);
- }
- */
+ /* Start a new header line, not a continuation */
if(full_line[0]) {
if(full_line[0]) {
+ /* printf("INDEX %s\n", full_line); */
index_one_mbox_line(nb_fields_to_parse, fields_to_parse, full_line, db_file);
}
index_one_mbox_line(nb_fields_to_parse, fields_to_parse, full_line, db_file);
}
@@
-641,7
+650,7
@@
void index_mbox(const char *mbox_filename,
}
void recursive_index_mbox(FILE *db_file,
}
void recursive_index_mbox(FILE *db_file,
- const char *entry_name,
+ const char *entry_name,
regex_t *mbox_filename_regexp,
int nb_fields_to_parse, struct parsable_field *fields_to_parse) {
DIR *dir;
struct dirent *dir_e;
int nb_fields_to_parse, struct parsable_field *fields_to_parse) {
DIR *dir;
struct dirent *dir_e;
@@
-662,12
+671,17
@@
void recursive_index_mbox(FILE *db_file,
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name);
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name);
- recursive_index_mbox(db_file, subname, nb_fields_to_parse, fields_to_parse);
+ recursive_index_mbox(db_file, subname, mbox_filename_regexp,
+ nb_fields_to_parse, fields_to_parse);
}
}
closedir(dir);
} else {
}
}
closedir(dir);
} else {
- index_mbox(entry_name, nb_fields_to_parse, fields_to_parse, db_file);
+ const char *s = entry_name, *filename = s;
+ while(*s) { if(*s == '/') { filename = s+1; }; s++; }
+ if(!mbox_filename_regexp || regexec(mbox_filename_regexp, filename, 0, 0, 0) == 0) {
+ index_mbox(entry_name, nb_fields_to_parse, fields_to_parse, db_file);
+ }
}
}
}
}
@@
-683,111
+697,128
@@
static struct option long_options[] = {
{ "help", no_argument, 0, 'h' },
{ "version", no_argument, 0, 'v' },
{ "quiet", no_argument, 0, 'q' },
{ "help", no_argument, 0, 'h' },
{ "version", no_argument, 0, 'v' },
{ "quiet", no_argument, 0, 'q' },
- { "db-file", 1, 0, 'd' },
+ { "use-leading-time", no_argument, 0, 't' },
+ { "db-file-generate", 1, 0, 'd' },
{ "db-pattern", 1, 0, 'p' },
{ "db-root", 1, 0, 'r' },
{ "db-list", 1, 0, 'l' },
{ "db-pattern", 1, 0, 'p' },
{ "db-root", 1, 0, 'r' },
{ "db-list", 1, 0, 'l' },
+ { "mbox-pattern", 1, 0, 'm' },
{ "search", 1, 0, 's' },
{ "index", 0, 0, 'i' },
{ "output", 1, 0, 'o' },
{ "search", 1, 0, 's' },
{ "index", 0, 0, 'i' },
{ "output", 1, 0, 'o' },
+ { "default-search", 1, 0, 'a' },
{ 0, 0, 0, 0 }
};
{ 0, 0, 0, 0 }
};
-/*********************************************************************/
-
-void init_condition(struct search_condition *condition, char *string) {
-
char full_search_field[TOKEN_BUFFER_SIZE], *search_field
;
-
int m
;
+struct time_criterion {
+ char *label;
+ int start_hour, end_hour;
+
int past_week_day
;
+
}
;
- string = parse_token(full_search_field, TOKEN_BUFFER_SIZE, ' ', string);
- search_field = full_search_field;
+/*********************************************************************/
- if(search_field[0] == '!') {
- search_field++;
- condition->negation = 1;
- } else {
- condition->negation = 0;
- }
+static struct time_criterion time_criteria[] = {
- /* Last 8 hours */
+ { "8h", 8, -1, -1 },
+ { "today", 24, -1, -1 },
+ { "24h", 24, -1, -1 },
+ { "48h", 48, -1, -1 },
+ { "week", 24 * 7, -1, -1 },
+ { "month", 24 * 31, -1, -1 },
+ { "year", 24 * 365, -1, -1 },
- if(strcmp(search_field, "8h") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time(0) - 3600 * 8;
- condition->interval_stop = 0;
- }
+ { "yesterday", 48, 24, -1 },
- /* Today and yesterday */
+ { "monday", -1, -1, 1 },
+ { "tuesday", -1, -1, 2 },
+ { "wednesday", -1, -1, 3 },
+ { "thursday", -1, -1, 4 },
+ { "friday", -1, -1, 5 },
+ { "saturday", -1, -1, 6 },
+ { "sunday", -1, -1, 7 },
- else if(strcmp(search_field, "24h") == 0 ||
- strcmp(search_field, "today") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time(0) - 3600 * 24;
- condition->interval_stop = 0;
- }
+};
- else if(strcmp(search_field, "yesterday") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time(0) - 2 * 3600 * 24;
- condition->interval_stop = condition->interval_start + 3600 * 24;
- }
+/*********************************************************************/
- /* Week days */
+time_t time_for_past_day(int day) {
+ time_t t;
+ struct tm *tm;
+ int delta_day;
+ t = time(0);
+ tm = localtime(&t);
+ delta_day = (7 + tm->tm_wday - day) % 7;
+ if(delta_day == 0) { delta_day = 7; }
+ return t - (delta_day * 3600 * 24 + tm->tm_sec + 60 * tm->tm_min + 3600 * tm->tm_hour);
+}
- else if(strcmp(search_field, "monday") == 0) {
- condition->field_id = ID_INTERVAL;
-
condition->interval_start = time_for_past_day(1)
;
-
condition->interval_stop = condition->interval_start + 3600 * 24
;
- }
+void init_condition(struct search_condition *condition, const char *full_string,
+ const char *default_search_field) {
+
char full_search_field[TOKEN_BUFFER_SIZE], *search_field
;
+
unsigned int k, m
;
+ const char *string;
- else if(strcmp(search_field, "tuesday") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time_for_past_day(2);
- condition->interval_stop = condition->interval_start + 3600 * 24;
- }
+ string = parse_token(full_search_field, TOKEN_BUFFER_SIZE, ' ', full_string);
+ search_field = full_search_field;
- else if(strcmp(search_field, "wednesday") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time_for_past_day(3);
- condition->interval_stop = condition->interval_start + 3600 * 24;
+ if(search_field[0] == '!') {
+ search_field++;
+ condition->negation = 1;
+ } else {
+ condition->negation = 0;
}
}
- else if(strcmp(search_field, "thursday") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time_for_past_day(4);
- condition->interval_stop = condition->interval_start + 3600 * 24;
- }
+ condition->field_id = -1;
- else if(strcmp(search_field, "friday") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time_for_past_day(5);
- condition->interval_stop = condition->interval_start + 3600 * 24;
- }
+ /* Recently */
- else if(strcmp(search_field, "saturday") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time_for_past_day(6);
- condition->interval_stop = condition->interval_start + 3600 * 24;
+ for(k = 0; k < sizeof(time_criteria) / sizeof(struct time_criterion); k++) {
+ if(strcmp(time_criteria[k].label, search_field) == 0) {
+ condition->field_id = ID_INTERVAL;
+ if(time_criteria[k].past_week_day < 0) {
+ condition->interval_start = time(0) - 3600 * time_criteria[k].start_hour;
+ if(time_criteria[k].end_hour >= 0) {
+ condition->interval_stop = time(0) - 3600 * time_criteria[k].end_hour;
+ } else {
+ condition->interval_stop = 0;
+ }
+ } else {
+ condition->interval_start = time_for_past_day(time_criteria[k].past_week_day);
+ condition->interval_stop = condition->interval_start + 3600 * 24;
+ }
+ break;
+ }
}
}
- else if(strcmp(search_field, "sunday") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time_for_past_day(7);
- condition->interval_stop = condition->interval_start + 3600 * 24;
- }
+ if(condition->field_id == -1) {
- else {
- condition->field_id = -1;
+ /* No time condition matched, look for the search fields */
for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
- if(strncmp(field_
name
s[m], search_field, strlen(search_field)) == 0) {
+ if(strncmp(field_
key
s[m], search_field, strlen(search_field)) == 0) {
condition->field_id = m;
}
}
condition->field_id = m;
}
}
+ /* None match, if there is a default search field, re-run the search with it */
+
+ if(condition->field_id == -1) {
+ if(default_search_field) {
+ for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
+ if(strncmp(field_keys[m],
+ default_search_field, strlen(default_search_field)) == 0) {
+ condition->field_id = m;
+ }
+ }
+ string = full_string;
+ if(string[0] == '!') { string++; }
+ }
+ }
+
if(condition->field_id == -1) {
fprintf(stderr,
if(condition->field_id == -1) {
fprintf(stderr,
- "mymail: Syntax error in field
name
\"%s\".\n",
+ "mymail: Syntax error in field
key
\"%s\".\n",
search_field);
exit(EXIT_FAILURE);
}
search_field);
exit(EXIT_FAILURE);
}
@@
-798,7
+829,7
@@
void init_condition(struct search_condition *condition, char *string) {
fprintf(stderr,
"mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
string,
fprintf(stderr,
"mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
string,
- field_
name
s[condition->field_id]);
+ field_
key
s[condition->field_id]);
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
}
}
@@
-815,34
+846,38
@@
void free_condition(struct search_condition *condition) {
/*********************************************************************/
int main(int argc, char **argv) {
/*********************************************************************/
int main(int argc, char **argv) {
+ char *db_filename = 0;
+ char *db_filename_regexp_string = 0;
+ char *db_root_path = 0;
+ char *db_filename_list = 0;
+ char *mbox_filename_regexp_string = 0;
+ char *default_search_field;
+ char output_filename[PATH_MAX + 1];
+ int action_index = 0;
int error = 0, show_help = 0;
int error = 0, show_help = 0;
- const int nb_fields_to_parse = sizeof(fields_to_parse) / sizeof(struct parsable_field);
+ const unsigned int nb_fields_to_parse =
+ sizeof(fields_to_parse) / sizeof(struct parsable_field);
char c;
char c;
- int f, n;
- int nb_search_conditions;
- FILE *output_file;
+ unsigned int f, n;
+ unsigned int nb_search_conditions;
struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS];
struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS];
- if(regcomp(&leading_from_line_regexp,
- "^From [^ ]* \\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\) \\(Jan\\|Feb\\|Mar\\|Apr\\|May\\|Jun\\|Jul\\|Aug\\|Sep\\|Oct\\|Nov\\|Dec\\) [ 123][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]\n$",
- 0)) {
+ if(regcomp(&global_leading_from_line_regexp, LEADING_FROM_LINE_REGEXP_STRING, 0)) {
fprintf(stderr,
"mymail: Cannot compile leading \"from\" line regexp. That is strange.\n");
exit(EXIT_FAILURE);
}
fprintf(stderr,
"mymail: Cannot compile leading \"from\" line regexp. That is strange.\n");
exit(EXIT_FAILURE);
}
- paranoid = 0;
- action_index = 0;
- db_filename = 0;
- db_root_path = 0;
- db_filename_list = 0;
- quiet = 0;
+ global_quiet = 0;
+ global_use_leading_time = 0;
+ default_search_field = 0;
+ strncpy(output_filename, "", PATH_MAX);
setlocale(LC_ALL, "");
nb_search_conditions = 0;
setlocale(LC_ALL, "");
nb_search_conditions = 0;
- while ((c = getopt_long(argc, argv, "hvqip:s:d:r:l:o:",
+ while ((c = getopt_long(argc, argv, "hvqip:s:d:r:l:o:
a:m:
",
long_options, NULL)) != -1) {
switch(c) {
long_options, NULL)) != -1) {
switch(c) {
@@
-856,7
+891,11
@@
int main(int argc, char **argv) {
break;
case 'q':
break;
case 'q':
- quiet = 1;
+ global_quiet = 1;
+ break;
+
+ case 't':
+ global_use_leading_time = 1;
break;
case 'i':
break;
case 'i':
@@
-864,22
+903,46
@@
int main(int argc, char **argv) {
break;
case 'd':
break;
case 'd':
+ if(db_filename) {
+ fprintf(stderr, "mymail: Can not set the db filename twice.\n");
+ exit(EXIT_FAILURE);
+ }
db_filename = strdup(optarg);
break;
case 'p':
db_filename = strdup(optarg);
break;
case 'p':
+ if(db_filename_regexp_string) {
+ fprintf(stderr, "mymail: Can not set the db filename pattern twice.\n");
+ exit(EXIT_FAILURE);
+ }
db_filename_regexp_string = strdup(optarg);
break;
db_filename_regexp_string = strdup(optarg);
break;
+ case 'm':
+ if(mbox_filename_regexp_string) {
+ fprintf(stderr, "mymail: Can not set the mbox filename pattern twice.\n");
+ exit(EXIT_FAILURE);
+ }
+ mbox_filename_regexp_string = strdup(optarg);
+ break;
+
case 'o':
strncpy(output_filename, optarg, PATH_MAX);
break;
case 'r':
case 'o':
strncpy(output_filename, optarg, PATH_MAX);
break;
case 'r':
+ if(db_root_path) {
+ fprintf(stderr, "mymail: Can not set the db root path twice.\n");
+ exit(EXIT_FAILURE);
+ }
db_root_path = strdup(optarg);
break;
case 'l':
db_root_path = strdup(optarg);
break;
case 'l':
+ if(db_filename_list) {
+ fprintf(stderr, "mymail: Can not set the db filename list twice.\n");
+ exit(EXIT_FAILURE);
+ }
db_filename_list = strdup(optarg);
break;
db_filename_list = strdup(optarg);
break;
@@
-888,66
+951,44
@@
int main(int argc, char **argv) {
fprintf(stderr, "mymail: Too many search patterns.\n");
exit(EXIT_FAILURE);
}
fprintf(stderr, "mymail: Too many search patterns.\n");
exit(EXIT_FAILURE);
}
- init_condition(&search_conditions[nb_search_conditions], optarg);
+ init_condition(&search_conditions[nb_search_conditions], optarg
, default_search_field
);
nb_search_conditions++;
break;
nb_search_conditions++;
break;
+ case 'a':
+ default_search_field = optarg;
+ break;
+
default:
error = 1;
break;
}
}
default:
error = 1;
break;
}
}
- if(!db_filename) {
- char *default_db_filename = getenv("MYMAIL_DB_FILE");
-
- if(!default_db_filename) {
- default_db_filename = "mymail.db";
- }
-
- db_filename = strdup(default_db_filename);
- }
-
- if(!db_filename_regexp_string) {
- char *default_db_filename_regexp_string = getenv("MYMAIL_DB_PATTERN");
-
- if(!default_db_filename_regexp_string) {
- default_db_filename_regexp_string = "^mymail.db$";
- }
-
- db_filename_regexp_string = strdup(default_db_filename_regexp_string);
- }
+ /* Set all the values that may defined in the arguments, through
+ environment variables, or hard-coded */
- if(!db_root_path) {
- char *default_db_root_path = getenv("MYMAIL_DB_ROOT");
+ db_filename = default_value(db_filename,
+ "MYMAIL_DB_FILE",
+ "mymail.db");
- if(default_db_root_path) {
- db_root_path = strdup(default_db_root_path);
- }
- }
+ db_filename_regexp_string = default_value(db_filename_regexp_string,
+ "MYMAIL_DB_FILE",
+ "\\.db$");
- if(!db_filename_list) {
- char *default_db_filename_list = getenv("MYMAIL_DB_LIST");
+ db_root_path = default_value(db_root_path,
+ "MYMAIL_DB_ROOT",
+ 0);
- if(default_db_filename_list) {
- db_filename_list = strdup(default_db_filename_list);
- }
- }
+ db_filename_list = default_value(db_filename_list,
+ "MYMAIL_DB_LIST",
+ 0);
- if(output_filename[0]) {
- output_file = fopen(output_filename, "w");
+ mbox_filename_regexp_string = default_value(mbox_filename_regexp_string,
+ "MYMAIL_MBOX_PATTERN",
+ 0);
- if(!output_file) {
- fprintf(stderr,
- "mymail: Cannot open result file \"%s\" for writing: %s\n",
- output_filename,
- strerror(errno));
- exit(EXIT_FAILURE);
- }
- } else {
- output_file = stdout;
- quiet = 1;
- }
+ /* Start the processing */
if(error) {
print_usage(stderr);
if(error) {
print_usage(stderr);
@@
-959,27
+1000,37
@@
int main(int argc, char **argv) {
exit(EXIT_SUCCESS);
}
exit(EXIT_SUCCESS);
}
+ /* mbox indexing */
+
if(action_index) {
FILE *db_file;
if(action_index) {
FILE *db_file;
+ regex_t mbox_filename_regexp_static;
+ regex_t *mbox_filename_regexp;
- db_file = fopen(db_filename, "w");
-
- if(!db_file) {
- fprintf(stderr,
- "mymail: Cannot open \"%s\" for writing: %s\n",
- db_filename,
- strerror(errno));
- exit(EXIT_FAILURE);
+ if(mbox_filename_regexp_string) {
+ if(regcomp(&mbox_filename_regexp_static,
+ mbox_filename_regexp_string,
+ 0)) {
+ fprintf(stderr,
+ "mymail: Syntax error in regexp \"%s\".\n",
+ mbox_filename_regexp_string);
+ exit(EXIT_FAILURE);
+ }
+ mbox_filename_regexp = &mbox_filename_regexp_static;
+ } else {
+ mbox_filename_regexp = 0;
}
}
+ db_file = safe_fopen(db_filename, "w", "index file for indexing");
+
for(f = 0; f < nb_fields_to_parse; f++) {
if(regcomp(&fields_to_parse[f].regexp,
fields_to_parse[f].regexp_string,
for(f = 0; f < nb_fields_to_parse; f++) {
if(regcomp(&fields_to_parse[f].regexp,
fields_to_parse[f].regexp_string,
-
REG_ICASE
)) {
+
fields_to_parse[f].cflags
)) {
fprintf(stderr,
"mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
fields_to_parse[f].regexp_string,
fprintf(stderr,
"mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
fields_to_parse[f].regexp_string,
- field_
name
s[fields_to_parse[f].id]);
+ field_
key
s[fields_to_parse[f].id]);
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
}
}
@@
-988,7
+1039,7
@@
int main(int argc, char **argv) {
while(optind < argc) {
recursive_index_mbox(db_file,
while(optind < argc) {
recursive_index_mbox(db_file,
- argv[optind],
+ argv[optind],
mbox_filename_regexp,
nb_fields_to_parse, fields_to_parse);
optind++;
}
nb_fields_to_parse, fields_to_parse);
optind++;
}
@@
-996,13
+1047,29
@@
int main(int argc, char **argv) {
fflush(db_file);
fclose(db_file);
fflush(db_file);
fclose(db_file);
+ if(mbox_filename_regexp) {
+ regfree(mbox_filename_regexp);
+ }
+
for(f = 0; f < nb_fields_to_parse; f++) {
regfree(&fields_to_parse[f].regexp);
}
}
for(f = 0; f < nb_fields_to_parse; f++) {
regfree(&fields_to_parse[f].regexp);
}
}
+ /* Mail search */
+
else {
else {
+ FILE *output_file;
+ int nb_extracted_mails = 0;
+
+ if(output_filename[0]) {
+ output_file = safe_fopen(output_filename, "w", "result mbox");
+ } else {
+ output_file = stdout;
+ global_quiet = 1;
+ }
+
if(nb_search_conditions > 0) {
/* Recursive search if db_root_path is set */
if(nb_search_conditions > 0) {
/* Recursive search if db_root_path is set */
@@
-1018,9
+1085,9
@@
int main(int argc, char **argv) {
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
- recursive_search_in_db(db_root_path, &db_filename_regexp,
- nb_search_conditions, search_conditions,
- output_file);
+
nb_extracted_mails +=
recursive_search_in_db(db_root_path, &db_filename_regexp,
+
nb_search_conditions, search_conditions,
+
output_file);
regfree(&db_filename_regexp);
}
regfree(&db_filename_regexp);
}
@@
-1029,7
+1096,7
@@
int main(int argc, char **argv) {
if(db_filename_list) {
char db_filename[PATH_MAX + 1];
if(db_filename_list) {
char db_filename[PATH_MAX + 1];
- char *s;
+ c
onst c
har *s;
s = db_filename_list;
s = db_filename_list;
@@
-1037,7
+1104,8
@@
int main(int argc, char **argv) {
s = parse_token(db_filename, PATH_MAX + 1, ';', s);
if(db_filename[0]) {
s = parse_token(db_filename, PATH_MAX + 1, ';', s);
if(db_filename[0]) {
- search_in_db(db_filename, nb_search_conditions, search_conditions, output_file);
+ nb_extracted_mails +=
+ search_in_db(db_filename, nb_search_conditions, search_conditions, output_file);
}
}
}
}
}
}
@@
-1045,27
+1113,38
@@
int main(int argc, char **argv) {
/* Search in all db files listed in the command arguments */
while(optind < argc) {
/* Search in all db files listed in the command arguments */
while(optind < argc) {
- search_in_db(argv[optind], nb_search_conditions, search_conditions, output_file);
+ nb_extracted_mails +=
+ search_in_db(argv[optind], nb_search_conditions, search_conditions, output_file);
optind++;
}
}
optind++;
}
}
+
+ if(!global_quiet) {
+ if(nb_extracted_mails > 0) {
+ printf("Found %d matching mails.\n", nb_extracted_mails);
+ } else {
+ printf("No matching mail found.\n");
+ }
+ }
+
+ fflush(output_file);
+
+ if(output_file != stdout) {
+ fclose(output_file);
+ }
}
for(n = 0; n < nb_search_conditions; n++) {
free_condition(&search_conditions[n]);
}
}
for(n = 0; n < nb_search_conditions; n++) {
free_condition(&search_conditions[n]);
}
- if(output_file != stdout) {
- fflush(output_file);
- fclose(output_file);
- }
-
free(db_filename);
free(db_filename_regexp_string);
free(db_root_path);
free(db_filename_list);
free(db_filename);
free(db_filename_regexp_string);
free(db_root_path);
free(db_filename_list);
+ free(mbox_filename_regexp_string);
- regfree(&leading_from_line_regexp);
+ regfree(&
global_
leading_from_line_regexp);
exit(EXIT_SUCCESS);
}
exit(EXIT_SUCCESS);
}