projects
/
mymail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplified a bit.
[mymail.git]
/
mymail.c
diff --git
a/mymail.c
b/mymail.c
index
3718157
..
219f6a3
100644
(file)
--- a/
mymail.c
+++ b/
mymail.c
@@
-57,9
+57,7
@@
/* Global variables! */
/* Global variables! */
-int paranoid;
int quiet;
int quiet;
-int ignore_dot_files;
regex_t leading_from_line_regexp;
regex_t leading_from_line_regexp;
@@
-238,7
+236,7
@@
int ignore_entry(const char *name) {
return
strcmp(name, ".") == 0 ||
strcmp(name, "..") == 0 ||
return
strcmp(name, ".") == 0 ||
strcmp(name, "..") == 0 ||
- (
ignore_dot_files &&
name[0] == '.' && name[1] != '/');
+ (name[0] == '.' && name[1] != '/');
}
int is_a_leading_from_line(char *mbox_line) {
}
int is_a_leading_from_line(char *mbox_line) {
@@
-432,19
+430,19
@@
int search_in_db(const char *db_filename,
/* Now 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++;
+ }
}
}
}
}
@@
-575,7
+573,6
@@
void index_mbox(const char *mbox_filename,
"Got a ^\"From \" in the header in %s:%lu.\n",
mbox_filename, position_in_file);
fprintf(stderr, "%s", raw_mbox_line);
"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); }
}
in_header = 1;
new_header = 1;
}
in_header = 1;
new_header = 1;
@@
-704,6
+701,7
@@
static struct time_criterion time_criteria[] = {
{ "8h", 8, -1, -1 },
{ "today", 24, -1, -1 },
{ "24h", 24, -1, -1 },
{ "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 },
{ "week", 24 * 7, -1, -1 },
{ "month", 24 * 31, -1, -1 },
{ "year", 24 * 365, -1, -1 },
@@
-847,10
+845,8
@@
int main(int argc, char **argv) {
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
- paranoid = 0;
quiet = 0;
default_search_field = 0;
quiet = 0;
default_search_field = 0;
- ignore_dot_files = 1;
strncpy(output_filename, "", PATH_MAX);
setlocale(LC_ALL, "");
strncpy(output_filename, "", PATH_MAX);
setlocale(LC_ALL, "");