/* Global variables! */
int global_quiet;
+int global_use_leading_time;
regex_t global_leading_from_line_regexp;
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 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) {
+ if(!strptime(mbox_value, "%a, %d %b %Y %k:%M:%S", &tm)) {
+ strptime(mbox_value, "%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
fclose(mail_file);
}
+int check_full_mail_match(char *current_mail_filename,
+ int nb_search_conditions,
+ struct search_condition *search_conditions,
+ int nb_body_conditions,
+ int *hits,
+ int current_position_in_mail) {
+ int n, nb_fulfilled_body_conditions;
+
+ /* We first check all conditions but the body ones */
+
+ for(n = 0; n < nb_search_conditions &&
+ ((search_conditions[n].field_id == ID_BODY) ||
+ xor(hits[n], search_conditions[n].negation)); n++);
+
+ if(n == nb_search_conditions) {
+
+ /* 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);
+
+ 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++;
+ }
+ }
+ }
+ return nb_body_conditions == nb_fulfilled_body_conditions;
+ } else {
+ return 0;
+ }
+}
+
int search_in_db(const char *db_filename,
int nb_search_conditions,
struct search_condition *search_conditions,
const char *mbox_value;
int mbox_id;
int already_written, m, n;
- int nb_body_conditions, nb_fulfilled_body_conditions;
+ int nb_body_conditions;
FILE *db_file;
int nb_extracted_mails;
if(strcmp("mail", mbox_key) == 0) {
char position_in_file_string[TOKEN_BUFFER_SIZE];
-
- if(current_mail_filename[0]) {
-
- /* We first check all conditions but the body ones */
-
- for(n = 0; n < nb_search_conditions &&
- ((search_conditions[n].field_id == ID_BODY) ||
- xor(hits[n], search_conditions[n].negation)); n++);
-
- if(n == nb_search_conditions) {
-
- /* 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);
-
- 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) {
- nb_extracted_mails++;
- extract_mail(current_mail_filename, current_position_in_mail, output_file);
- }
- }
+ if(current_mail_filename[0] &&
+ check_full_mail_match(current_mail_filename,
+ nb_search_conditions, search_conditions,
+ nb_body_conditions, hits, current_position_in_mail)) {
+ nb_extracted_mails++;
+ extract_mail(current_mail_filename, current_position_in_mail, output_file);
}
-
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, '\n', mbox_value);
current_position_in_mail = atol(position_in_file_string);
}
}
+ if(current_mail_filename[0] &&
+ check_full_mail_match(current_mail_filename,
+ nb_search_conditions, search_conditions,
+ nb_body_conditions, hits, current_position_in_mail)) {
+ nb_extracted_mails++;
+ extract_mail(current_mail_filename, current_position_in_mail, output_file);
+ }
+
fclose(db_file);
if(!global_quiet) {
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' },
static struct time_criterion time_criteria[] = {
{ "8h", 8, -1, -1 },
- { "today", 24, -1, -1 },
{ "24h", 24, -1, -1 },
{ "48h", 48, -1, -1 },
{ "week", 24 * 7, -1, -1 },
{ "yesterday", 48, 24, -1 },
+ { "today", -1, -1, 0 },
{ "monday", -1, -1, 1 },
{ "tuesday", -1, -1, 2 },
{ "wednesday", -1, -1, 3 },
int delta_day;
t = time(0);
tm = localtime(&t);
- delta_day = (7 + tm->tm_wday - day) % 7;
- if(delta_day == 0) { delta_day = 7; }
+ if(day > 0) {
+ delta_day = (7 + tm->tm_wday - day) % 7;
+ } else {
+ delta_day = 0;
+ }
return t - (delta_day * 3600 * 24 + tm->tm_sec + 60 * tm->tm_min + 3600 * tm->tm_hour);
}
}
}
string = full_string;
+ if(string[0] == '!') { string++; }
}
}
}
global_quiet = 0;
+ global_use_leading_time = 0;
default_search_field = 0;
strncpy(output_filename, "", PATH_MAX);
global_quiet = 1;
break;
+ case 't':
+ global_use_leading_time = 1;
+ break;
+
case 'i':
action_index = 1;
break;
projects / mymail.git / blobdiff