projects
/
mymail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a bug indexing the last header line of a mail in the next one.
[mymail.git]
/
mymail.c
diff --git
a/mymail.c
b/mymail.c
index
b7e46ba
..
87c23a3
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
@@
-57,11
+57,9
@@
/* Global variables! */
/* Global variables! */
-int paranoid;
-int quiet;
-int ignore_dot_files;
+int global_quiet;
-regex_t leading_from_line_regexp;
+regex_t
global_
leading_from_line_regexp;
/********************************************************************/
/********************************************************************/
@@
-78,7
+76,7
@@
enum {
MAX_ID
};
MAX_ID
};
-static char *field_
name
s[] = {
+static char *field_
key
s[] = {
"mail",
"lead",
"from",
"mail",
"lead",
"from",
@@
-238,13
+236,13
@@
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) {
return
strncmp(mbox_line, "From ", 5) == 0 &&
}
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_line_match_search(struct search_condition *condition,
@@
-365,7
+363,7
@@
int search_in_db(const char *db_filename,
char raw_db_line[BUFFER_SIZE];
char current_mail_filename[PATH_MAX + 1];
unsigned long int current_position_in_mail;
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;
const char *mbox_value;
int mbox_id;
int already_written, m, n;
@@
-375,7
+373,7
@@
int search_in_db(const char *db_filename,
nb_extracted_mails = 0;
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);
}
@@
-415,9
+413,9
@@
int 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]) {
@@
-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++;
+ }
}
}
}
}
@@
-466,7
+464,7
@@
int search_in_db(const char *db_filename,
else {
mbox_id = -1;
for(m = 0; (m < MAX_ID) && mbox_id == -1; m++) {
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;
}
}
@@
-479,7
+477,7
@@
int 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);
}
@@
-544,7
+542,7
@@
void index_one_mbox_line(unsigned int nb_fields_to_parse,
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);
}
}
@@
-570,17
+568,29
@@
void index_mbox(const char *mbox_filename,
while(fgets(raw_mbox_line, BUFFER_SIZE, file)) {
if(is_a_leading_from_line(raw_mbox_line)) {
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);
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';
+ }
}
if(in_header) {
}
if(in_header) {
@@
-590,6
+600,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++) = ' ';
@@
-601,17
+612,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);
}
@@
-704,6
+708,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 },
@@
-776,7
+781,7
@@
void init_condition(struct search_condition *condition, const char *full_string,
/* No time condition matched, look for the search fields */
for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
/* No time condition matched, look for the search fields */
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;
}
}
@@
-786,18
+791,19
@@
void init_condition(struct search_condition *condition, const char *full_string,
if(condition->field_id == -1) {
if(default_search_field) {
for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
if(condition->field_id == -1) {
if(default_search_field) {
for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
- if(strncmp(field_
name
s[m],
+ if(strncmp(field_
key
s[m],
default_search_field, strlen(default_search_field)) == 0) {
condition->field_id = m;
}
}
string = full_string;
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);
}
@@
-808,7
+814,7
@@
void init_condition(struct search_condition *condition, const char *full_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);
}
}
@@
-841,16
+847,14
@@
int main(int argc, char **argv) {
unsigned int nb_search_conditions;
struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS];
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);
}
fprintf(stderr,
"mymail: Cannot compile leading \"from\" line regexp. That is strange.\n");
exit(EXIT_FAILURE);
}
- paranoid = 0;
- quiet = 0;
+ global_quiet = 0;
default_search_field = 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, "");
@@
-871,7
+875,7
@@
int main(int argc, char **argv) {
break;
case 'q':
break;
case 'q':
- quiet = 1;
+
global_
quiet = 1;
break;
case 'i':
break;
case 'i':
@@
-1006,7
+1010,7
@@
int main(int argc, char **argv) {
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);
}
}
@@
-1043,7
+1047,7
@@
int main(int argc, char **argv) {
output_file = safe_fopen(output_filename, "w", "result mbox");
} else {
output_file = stdout;
output_file = safe_fopen(output_filename, "w", "result mbox");
} else {
output_file = stdout;
- quiet = 1;
+
global_
quiet = 1;
}
if(nb_search_conditions > 0) {
}
if(nb_search_conditions > 0) {
@@
-1095,7
+1099,7
@@
int main(int argc, char **argv) {
}
}
}
}
- if(!quiet) {
+ if(!
global_
quiet) {
if(nb_extracted_mails > 0) {
printf("Found %d matching mails.\n", nb_extracted_mails);
} else {
if(nb_extracted_mails > 0) {
printf("Found %d matching mails.\n", nb_extracted_mails);
} else {
@@
-1120,7
+1124,7
@@
int main(int argc, char **argv) {
free(db_filename_list);
free(mbox_filename_regexp_string);
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);
}