/* Global variables! */
-int quiet;
+int global_quiet;
+int global_use_leading_time;
-regex_t leading_from_line_regexp;
+regex_t global_leading_from_line_regexp;
/********************************************************************/
MAX_ID
};
-static char *field_names[] = {
+static char *field_keys[] = {
"mail",
"lead",
"from",
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");
int is_a_leading_from_line(char *mbox_line) {
return
strncmp(mbox_line, "From ", 5) == 0 &&
- regexec(&leading_from_line_regexp, mbox_line, 0, 0, 0) == 0;
+ regexec(&global_leading_from_line_regexp, mbox_line, 0, 0, 0) == 0;
}
int mbox_line_match_search(struct search_condition *condition,
int mbox_id, const char *mbox_value) {
if(condition->field_id == ID_INTERVAL) {
- if(mbox_id == ID_LEADING_LINE) {
- const 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 {
- 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
char raw_db_line[BUFFER_SIZE];
char current_mail_filename[PATH_MAX + 1];
unsigned long int current_position_in_mail;
- char mbox_name[TOKEN_BUFFER_SIZE];
+ char mbox_key[TOKEN_BUFFER_SIZE];
const char *mbox_value;
int mbox_id;
int already_written, m, n;
nb_extracted_mails = 0;
- if(!quiet) {
+ if(!global_quiet) {
printf("Searching in '%s' ... ", db_filename);
fflush(stdout);
}
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]) {
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;
}
}
fclose(db_file);
- if(!quiet) {
+ if(!global_quiet) {
printf("done.\n");
fflush(stdout);
}
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_names[fields_to_parse[f].id],
+ field_keys[fields_to_parse[f].id],
raw_mbox_line + matches.rm_eo);
}
}
while(fgets(raw_mbox_line, BUFFER_SIZE, file)) {
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);
}
+
+ /* printf("LEADING_LINE %s", raw_mbox_line); */
+
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';
+ }
}
if(in_header) {
}
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++) = ' ';
}
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]) {
+ /* printf("INDEX %s\n", full_line); */
index_one_mbox_line(nb_fields_to_parse, fields_to_parse, full_line, db_file);
}
{ "help", no_argument, 0, 'h' },
{ "version", no_argument, 0, 'v' },
{ "quiet", no_argument, 0, 'q' },
+ { "use-leading-time", no_argument, 0, 't' },
{ "db-file-generate", 1, 0, 'd' },
{ "db-pattern", 1, 0, 'p' },
{ "db-root", 1, 0, 'r' },
/* No time condition matched, look for the search fields */
for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
- if(strncmp(field_names[m], search_field, strlen(search_field)) == 0) {
+ if(strncmp(field_keys[m], search_field, strlen(search_field)) == 0) {
condition->field_id = m;
}
}
if(condition->field_id == -1) {
if(default_search_field) {
for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
- if(strncmp(field_names[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,
- "mymail: Syntax error in field name \"%s\".\n",
+ "mymail: Syntax error in field key \"%s\".\n",
search_field);
exit(EXIT_FAILURE);
}
fprintf(stderr,
"mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
string,
- field_names[condition->field_id]);
+ field_keys[condition->field_id]);
exit(EXIT_FAILURE);
}
}
unsigned int nb_search_conditions;
struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS];
- if(regcomp(&leading_from_line_regexp, LEADING_FROM_LINE_REGEXP_STRING, 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);
}
- quiet = 0;
+ global_quiet = 0;
+ global_use_leading_time = 0;
default_search_field = 0;
strncpy(output_filename, "", PATH_MAX);
break;
case 'q':
- quiet = 1;
+ global_quiet = 1;
+ break;
+
+ case 't':
+ global_use_leading_time = 1;
break;
case 'i':
fprintf(stderr,
"mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
fields_to_parse[f].regexp_string,
- field_names[fields_to_parse[f].id]);
+ field_keys[fields_to_parse[f].id]);
exit(EXIT_FAILURE);
}
}
output_file = safe_fopen(output_filename, "w", "result mbox");
} else {
output_file = stdout;
- quiet = 1;
+ global_quiet = 1;
}
if(nb_search_conditions > 0) {
}
}
- if(!quiet) {
+ if(!global_quiet) {
if(nb_extracted_mails > 0) {
printf("Found %d matching mails.\n", nb_extracted_mails);
} else {
free(db_filename_list);
free(mbox_filename_regexp_string);
- regfree(&leading_from_line_regexp);
+ regfree(&global_leading_from_line_regexp);
exit(EXIT_SUCCESS);
}