projects
/
mymail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment cosmetics.
[mymail.git]
/
mymail.c
diff --git
a/mymail.c
b/mymail.c
index
347f2a4
..
6fa1814
100644
(file)
--- a/
mymail.c
+++ b/
mymail.c
@@
-21,11
+21,13
@@
/*
/*
- This command is a dumb mail indexer. It can either (1) scan
- directories containing mbox files, and create a db file containing
- for each mail a list of fields computed from the header, or (2)
- read such a db file and get all the mails matching regexp-defined
- conditions on the fields, to create a resulting mbox file.
+ mymail is a simple mail indexer. It can:
+
+ (1) scan mbox files, and create a db file containing for each mail a
+ list of fields computed from its header.
+
+ (2) read such a db file, gets all the mails matching regexp-defined
+ conditions on the fields, and generates a resulting mbox file.
It is low-tech, simple, light and fast.
It is low-tech, simple, light and fast.
@@
-84,6
+86,8
@@
enum {
ID_PARTICIPANT,
ID_BODY,
ID_TIME_INTERVAL,
ID_PARTICIPANT,
ID_BODY,
ID_TIME_INTERVAL,
+ ID_MAIL_ID,
+ ID_REFERENCE_ID,
MAX_ID
};
MAX_ID
};
@@
-96,7
+100,9
@@
static char *field_keys[] = {
"date",
"part",
"body",
"date",
"part",
"body",
- "interval"
+ "interval",
+ "mailid",
+ "references"
};
/********************************************************************/
};
/********************************************************************/
@@
-153,6
+159,20
@@
static struct parsable_field fields_to_parse[] = {
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
},
+ {
+ ID_MAIL_ID,
+ REG_ICASE,
+ "^message-id: ",
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ },
+
+ {
+ ID_REFERENCE_ID,
+ REG_ICASE,
+ "^\\(in-reply-to\\|references\\): ",
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ },
+
};
/********************************************************************/
};
/********************************************************************/
@@
-506,6
+526,12
@@
int search_in_db(const char *db_filename,
while(nb_extracted_mails < global_nb_mails_max &&
fgets(raw_db_line, BUFFER_SIZE, db_file)) {
while(nb_extracted_mails < global_nb_mails_max &&
fgets(raw_db_line, BUFFER_SIZE, db_file)) {
+
+ /* Removes the CR */
+ char *s = raw_db_line;
+ while(*s && *s != '\n') { s++; }
+ *s = '\0';
+
db_value = parse_token(db_key_string, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
if(strcmp("mail", db_key_string) == 0) {
db_value = parse_token(db_key_string, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
if(strcmp("mail", db_key_string) == 0) {
@@
-521,7
+547,7
@@
int search_in_db(const char *db_filename,
for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; }
db_value = parse_token(position_in_file_string, TOKEN_BUFFER_SIZE, ' ', db_value);
for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; }
db_value = parse_token(position_in_file_string, TOKEN_BUFFER_SIZE, ' ', db_value);
-
db_value = parse_token(current_mail_filename, PATH_MAX+1, '\n', db_value
);
+
strncpy(current_mail_filename, db_value, PATH_MAX + 1
);
current_position_in_mail = atol(position_in_file_string);
}
current_position_in_mail = atol(position_in_file_string);
}
@@
-1146,6
+1172,16
@@
int main(int argc, char **argv) {
}
}
}
}
+ if(error) {
+ print_usage(stderr);
+ exit(EXIT_FAILURE);
+ }
+
+ if(show_help) {
+ print_usage(stdout);
+ exit(EXIT_SUCCESS);
+ }
+
/* Set all the values that may defined in the arguments, through
environment variables, or hard-coded */
/* Set all the values that may defined in the arguments, through
environment variables, or hard-coded */
@@
-1169,18
+1205,6
@@
int main(int argc, char **argv) {
"MYMAIL_MBOX_PATTERN",
0);
"MYMAIL_MBOX_PATTERN",
0);
- /* Start the processing */
-
- if(error) {
- print_usage(stderr);
- exit(EXIT_FAILURE);
- }
-
- if(show_help) {
- print_usage(stdout);
- exit(EXIT_SUCCESS);
- }
-
/* mbox indexing */
if(action_index) {
/* mbox indexing */
if(action_index) {