projects
/
mymail.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d57add
)
Introduced struct search_request.
author
Francois Fleuret
<francois@fleuret.org>
Fri, 1 Feb 2013 23:14:32 +0000
(
00:14
+0100)
committer
Francois Fleuret
<francois@fleuret.org>
Fri, 1 Feb 2013 23:14:32 +0000
(
00:14
+0100)
mymail.c
patch
|
blob
|
history
diff --git
a/mymail.c
b/mymail.c
index
abd4658
..
35a0344
100644
(file)
--- a/
mymail.c
+++ b/
mymail.c
@@
-68,6
+68,12
@@
static char *field_names[] = {
"part"
};
"part"
};
+struct search_request {
+ int field_id;
+ int negation;
+ regex_t regexp;
+};
+
struct parsable_field {
int id;
char *regexp_string;
struct parsable_field {
int id;
char *regexp_string;
@@
-141,17
+147,17
@@
int ignore_entry(const char *name) {
(name[0] == '.' && name[1] != '/');
}
(name[0] == '.' && name[1] != '/');
}
-int mbox_line_match_search(
int search_id, regex_t *search_regexp
,
+int mbox_line_match_search(
struct search_request *request
,
int mbox_id, char *mbox_value) {
return
int mbox_id, char *mbox_value) {
return
- (
search
_id == mbox_id ||
- (
search
_id == ID_PARTICIPANT && (mbox_id == ID_FROM || mbox_id == ID_DEST)))
+ (
request->field
_id == mbox_id ||
+ (
request->field
_id == ID_PARTICIPANT && (mbox_id == ID_FROM || mbox_id == ID_DEST)))
&&
&&
- regexec(
search_
regexp, mbox_value, 0, 0, 0) == 0;
+ regexec(
&request->
regexp, mbox_value, 0, 0, 0) == 0;
}
void search_in_db(int nb_search_patterns,
}
void search_in_db(int nb_search_patterns,
-
int *search_ids, char **search_regexp_string
s,
+
struct search_request *search_request
s,
FILE *db_file) {
int hits[MAX_NB_SEARCH_PATTERNS];
char raw_db_line[BUFFER_SIZE];
FILE *db_file) {
int hits[MAX_NB_SEARCH_PATTERNS];
char raw_db_line[BUFFER_SIZE];
@@
-160,21
+166,8
@@
void search_in_db(int nb_search_patterns,
unsigned long int current_position_in_mail;
char *mbox_name, *mbox_value;
int mbox_id;
unsigned long int current_position_in_mail;
char *mbox_name, *mbox_value;
int mbox_id;
- regex_t search_regexps[MAX_NB_SEARCH_PATTERNS];
int already_written, m, n;
int already_written, m, n;
- for(n = 0; n < nb_search_patterns; n++) {
- if(regcomp(&search_regexps[n],
- search_regexp_strings[n],
- REG_ICASE)) {
- fprintf(stderr,
- "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
- search_regexp_strings[n],
- field_names[search_ids[n]]);
- exit(EXIT_FAILURE);
- }
- }
-
current_position_in_mail = 0;
already_written = 0;
current_position_in_mail = 0;
already_written = 0;
@@
-232,20
+225,16
@@
void search_in_db(int nb_search_patterns,
}
}
for(n = 0; n < nb_search_patterns; n++) {
}
}
for(n = 0; n < nb_search_patterns; n++) {
- hits[n] |= mbox_line_match_search(
search_ids[n], &search_regexp
s[n],
+ hits[n] |= mbox_line_match_search(
&search_request
s[n],
mbox_id, mbox_value);
}
}
}
mbox_id, mbox_value);
}
}
}
-
- for(n = 0; n < nb_search_patterns; n++) {
- regfree(&search_regexps[n]);
- }
}
void recursive_search_in_db(const char *entry_name,
int nb_search_patterns,
}
void recursive_search_in_db(const char *entry_name,
int nb_search_patterns,
-
int *search_ids, char **search_regexp_string
s) {
+
struct search_request *search_request
s) {
DIR *dir;
struct dirent *dir_e;
struct stat sb;
DIR *dir;
struct dirent *dir_e;
struct stat sb;
@@
-268,7
+257,7
@@
void recursive_search_in_db(const char *entry_name,
snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name);
recursive_search_in_db(subname,
nb_search_patterns,
snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name);
recursive_search_in_db(subname,
nb_search_patterns,
- search_
ids, search_regexp_string
s);
+ search_
request
s);
}
}
closedir(dir);
}
}
closedir(dir);
@@
-301,8
+290,7
@@
void recursive_search_in_db(const char *entry_name,
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
- search_in_db(nb_search_patterns, search_ids, search_regexp_strings,
- db_file);
+ search_in_db(nb_search_patterns, search_requests, db_file);
fclose(db_file);
}
fclose(db_file);
}
@@
-492,7
+480,7
@@
int main(int argc, char **argv) {
char *search_pattern[MAX_NB_SEARCH_PATTERNS];
/* for(f = 0; f < argc; f++) { */
char *search_pattern[MAX_NB_SEARCH_PATTERNS];
/* for(f = 0; f < argc; f++) { */
-
/* printf("arg %d \"%s\"\n", f, argv[f]); */
+ /* printf("arg %d \"%s\"\n", f, argv[f]); */
/* } */
paranoid = 0;
/* } */
paranoid = 0;
@@
-622,28
+610,33
@@
int main(int argc, char **argv) {
else {
if(nb_search_patterns > 0) {
else {
if(nb_search_patterns > 0) {
-
int search_id
s[MAX_NB_SEARCH_PATTERNS];
- char *search_regexp_string
s[MAX_NB_SEARCH_PATTERNS]
;
+
struct search_request search_request
s[MAX_NB_SEARCH_PATTERNS];
+ char *search_regexp_string;
int m, n;
for(n = 0; n < nb_search_patterns; n++) {
int m, n;
for(n = 0; n < nb_search_patterns; n++) {
- search_regexp_strings[n] = segment_next_field(search_pattern[n]);
- search_ids[n] = -1;
- for(m = 0; (m < MAX_ID) && search_ids[n] == -1; m++) {
+ search_regexp_string = segment_next_field(search_pattern[n]);
+
+ search_requests[n].field_id = -1;
+ for(m = 0; (m < MAX_ID) && search_requests[n].field_id == -1; m++) {
if(strncmp(field_names[m], search_pattern[n], strlen(search_pattern[n])) == 0) {
if(strncmp(field_names[m], search_pattern[n], strlen(search_pattern[n])) == 0) {
- search_
ids[n]
= m;
+ search_
requests[n].field_id
= m;
}
}
}
}
- }
- if(!*search_regexp_strings) {
- fprintf(stderr,
- "Syntax error in the search pattern.\n");
- exit(EXIT_FAILURE);
+ if(regcomp(&search_requests[n].regexp,
+ search_regexp_string,
+ REG_ICASE)) {
+ fprintf(stderr,
+ "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
+ search_regexp_string,
+ field_names[search_requests[n].field_id]);
+ exit(EXIT_FAILURE);
+ }
}
recursive_search_in_db(db_root_path,
}
recursive_search_in_db(db_root_path,
- nb_search_patterns, search_
ids, search_regexp_string
s);
+ nb_search_patterns, search_
request
s);
for(n = 0; n < nb_search_patterns; n++) {
free(search_pattern[n]);
for(n = 0; n < nb_search_patterns; n++) {
free(search_pattern[n]);