projects
/
mymail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetics.
[mymail.git]
/
mymail.c
diff --git
a/mymail.c
b/mymail.c
index
ef6e5c1
..
219f6a3
100644
(file)
--- a/
mymail.c
+++ b/
mymail.c
@@
-46,7
+46,7
@@
#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.
2
"
+#define VERSION "0.9.
5
"
#define MAX_NB_SEARCH_CONDITIONS 32
#define MAX_NB_SEARCH_CONDITIONS 32
@@
-55,13
+55,11
@@
#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$"
#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$"
-regex_t leading_from_line_regexp;
-
/* Global variables! */
/* Global variables! */
-int paranoid;
int quiet;
int quiet;
-int ignore_dot_files;
+
+regex_t leading_from_line_regexp;
/********************************************************************/
/********************************************************************/
@@
-155,11
+153,12
@@
int xor(int a, int b) {
const char *parse_token(char *token_buffer, size_t token_buffer_size,
char separator, const char *string) {
char *u = token_buffer;
const char *parse_token(char *token_buffer, size_t token_buffer_size,
char separator, const char *string) {
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;
}
@@
-183,7
+182,6
@@
char *default_value(char *current_value,
FILE *safe_fopen(const char *path, const char *mode, const char *comment) {
FILE *result = fopen(path, mode);
FILE *safe_fopen(const char *path, const char *mode, const char *comment) {
FILE *result = fopen(path, mode);
- /* printf("Opening '%s' with mode \"%s\"\n", path, mode); */
if(result) {
return result;
} else {
if(result) {
return result;
} else {
@@
-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, "");