projects
/
mymail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Starting to write the search.
[mymail.git]
/
mymail.c
diff --git
a/mymail.c
b/mymail.c
index
da9bed1
..
25121a4
100644
(file)
--- a/
mymail.c
+++ b/
mymail.c
@@
-19,13
+19,6
@@
*
*/
*
*/
-/*
-
- To use it as a super-history-search for bash:
- mymail --bash <(history)
-
-*/
-
#define _GNU_SOURCE
#include <stdio.h>
#define _GNU_SOURCE
#include <stdio.h>
@@
-37,16
+30,23
@@
#include <getopt.h>
#include <limits.h>
#include <dirent.h>
#include <getopt.h>
#include <limits.h>
#include <dirent.h>
+#include <regex.h>
#define VERSION "0.1"
#define BUFFER_SIZE 16384
struct parsable_field {
#define VERSION "0.1"
#define BUFFER_SIZE 16384
struct parsable_field {
- char *regexp;
- char *db_filename;
+ char *name;
+ char *regexp_string;
+ regex_t regexp;
};
};
+char *db_filename;
+char *search_pattern;
+
+int action_index;
+
/********************************************************************/
/* malloc with error checking. */
/********************************************************************/
/* malloc with error checking. */
@@
-73,10
+73,11
@@
void usage(FILE *out) {
void read_file(const char *input_filename,
int nb_fields_to_parse, struct parsable_field *fields_to_parse,
void read_file(const char *input_filename,
int nb_fields_to_parse, struct parsable_field *fields_to_parse,
- FILE *
*db_files
) {
+ FILE *
db_file
) {
char raw_line[BUFFER_SIZE];
FILE *file;
char raw_line[BUFFER_SIZE];
FILE *file;
- int in_header;
+ int in_header, new_header;
+ unsigned int position_in_file;
file = fopen(input_filename, "r");
file = fopen(input_filename, "r");
@@
-86,23
+87,48
@@
void read_file(const char *input_filename,
}
in_header = 0;
}
in_header = 0;
+ new_header = 0;
+
+ position_in_file = 0;
while(fgets(raw_line, BUFFER_SIZE, file)) {
if(strncmp(raw_line, "From ", 5) == 0) {
if(in_header) {
while(fgets(raw_line, BUFFER_SIZE, file)) {
if(strncmp(raw_line, "From ", 5) == 0) {
if(in_header) {
- fprintf(stderr, "Got a 'From ' in the header.\n");
+ fprintf(stderr,
+ "Got a 'From ' in the header in %s:%u.\n",
+ input_filename, position_in_file);
+ fprintf(stderr, "%s", raw_line);
exit(EXIT_FAILURE);
}
in_header = 1;
exit(EXIT_FAILURE);
}
in_header = 1;
+ new_header = 1;
} else if(strncmp(raw_line, "\n", 1) == 0) {
if(in_header) { in_header = 0; }
}
} else if(strncmp(raw_line, "\n", 1) == 0) {
if(in_header) { in_header = 0; }
}
+ /* if(in_header) { */
+ /* printf("LINE.H %s", raw_line); */
+ /* } else { */
+ /* printf("LINE.B %s", raw_line); */
+ /* } */
+
if(in_header) {
if(in_header) {
- printf("LINE.H %s", raw_line);
- } else {
- printf("LINE.B %s", raw_line);
+ int f;
+ regmatch_t matches;
+ if(new_header) {
+ fprintf(db_file, "mail %s:%d\n", input_filename, position_in_file);
+ new_header = 0;
+ }
+ for(f = 0; f < nb_fields_to_parse; f++) {
+ if(regexec(&fields_to_parse[f].regexp, raw_line, 1, &matches, 0) == 0) {
+ fprintf(db_file, "%s %s",
+ fields_to_parse[f].name,
+ raw_line + matches.rm_eo);
+ }
+ }
}
}
+
+ position_in_file += strlen(raw_line);
}
fclose(file);
}
fclose(file);
@@
-117,7
+143,7
@@
int ignore_entry(const char *name) {
void process_entry(const char *dir_name,
int nb_fields_to_parse, struct parsable_field *fields_to_parse,
void process_entry(const char *dir_name,
int nb_fields_to_parse, struct parsable_field *fields_to_parse,
- FILE *
*db_files
) {
+ FILE *
db_file
) {
DIR *dir;
struct dirent *dir_e;
struct stat sb;
DIR *dir;
struct dirent *dir_e;
struct stat sb;
@@
-143,14
+169,14
@@
void process_entry(const char *dir_name,
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
snprintf(subname, PATH_MAX, "%s/%s", dir_name, dir_e->d_name);
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
snprintf(subname, PATH_MAX, "%s/%s", dir_name, dir_e->d_name);
- process_entry(subname, nb_fields_to_parse, fields_to_parse, db_file
s
);
+ process_entry(subname, nb_fields_to_parse, fields_to_parse, db_file);
}
}
closedir(dir);
} else {
if(S_ISREG(sb.st_mode)) {
}
}
closedir(dir);
} else {
if(S_ISREG(sb.st_mode)) {
- printf("Processing regular file '%s'.\n", dir_name);
- read_file(dir_name, nb_fields_to_parse, fields_to_parse, db_file
s
);
+ /* printf("Processing regular file '%s'.\n", dir_name); */
+ read_file(dir_name, nb_fields_to_parse, fields_to_parse, db_file);
}
}
}
}
}
}
@@
-166,11
+192,24
@@
enum
static struct option long_options[] = {
{ "help", no_argument, 0, 'h' },
static struct option long_options[] = {
{ "help", no_argument, 0, 'h' },
+ { "db-prefix", 1, 0, 'p' },
+ { "search-pattern", 1, 0, 's' },
+ { "index", 0, 0, 'i' },
{ 0, 0, 0, 0 }
};
static struct parsable_field fields_to_parse[] = {
{ 0, 0, 0, 0 }
};
static struct parsable_field fields_to_parse[] = {
- { "^[Tt][Oo]:", "/tmp/mymail-to" }
+ {
+ "from",
+ "^\\([Ff][Rr][Oo][Mm]:\\|From\\) *",
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ },
+
+ {
+ "dest",
+ "^\\([Tt][Oo]\\|[Cc][Cc]\\|[Bb][Cc][Cc]\\): *",
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ },
};
int main(int argc, char **argv) {
};
int main(int argc, char **argv) {
@@
-178,11
+217,13
@@
int main(int argc, char **argv) {
const int nb_fields_to_parse = sizeof(fields_to_parse) / sizeof(struct parsable_field);
char c;
int f;
const int nb_fields_to_parse = sizeof(fields_to_parse) / sizeof(struct parsable_field);
char c;
int f;
- FILE **db_files;
+
+ action_index = 0;
+ search_pattern = 0;
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
- while ((c = getopt_long(argc, argv, "h",
+ while ((c = getopt_long(argc, argv, "h
ip:s:
",
long_options, NULL)) != -1) {
switch(c) {
long_options, NULL)) != -1) {
switch(c) {
@@
-191,12
+232,33
@@
int main(int argc, char **argv) {
show_help = 1;
break;
show_help = 1;
break;
+ case 'i':
+ action_index = 1;
+ break;
+
+ case 'p':
+ db_filename = strdup(optarg);
+ break;
+
+ case 's':
+ if(search_pattern) {
+ fprintf(stderr,
+ "mymail: Search pattern already defined.\n");
+ exit(EXIT_FAILURE);
+ }
+ search_pattern = strdup(optarg);
+ break;
+
default:
error = 1;
break;
}
}
default:
error = 1;
break;
}
}
+ if(!db_filename) {
+ db_filename = strdup("/tmp/mymail");
+ }
+
if(error) {
usage(stderr);
exit(EXIT_FAILURE);
if(error) {
usage(stderr);
exit(EXIT_FAILURE);
@@
-207,30
+269,62
@@
int main(int argc, char **argv) {
exit(EXIT_SUCCESS);
}
exit(EXIT_SUCCESS);
}
- db_files = safe_malloc(nb_fields_to_parse * sizeof(FILE *));
-
- for(f = 0; f < nb_fields_to_parse; f++) {
- db_files[f] = fopen(fields_to_parse[f].db_filename, "w");
- if(!db_files[f]) {
+ if(action_index) {
+ FILE *db_file = fopen(db_filename, "w");
+ if(!db_file) {
fprintf(stderr,
"mymail: Can not open \"%s\" for writing: %s\n",
fprintf(stderr,
"mymail: Can not open \"%s\" for writing: %s\n",
-
fields_to_parse[f].
db_filename,
+ db_filename,
strerror(errno));
strerror(errno));
+ exit(EXIT_FAILURE);
}
}
- }
- while(optind < argc) {
- process_entry(argv[optind],
- nb_fields_to_parse, fields_to_parse,
- db_files);
- optind++;
- }
+ for(f = 0; f < nb_fields_to_parse; f++) {
+ if(regcomp(&fields_to_parse[f].regexp,
+ fields_to_parse[f].regexp_string,
+ REG_ICASE)) {
+ fprintf(stderr,
+ "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
+ fields_to_parse[f].regexp_string,
+ fields_to_parse[f].name);
+ exit(EXIT_FAILURE);
+ }
+ }
+
+ while(optind < argc) {
+ process_entry(argv[optind],
+ nb_fields_to_parse, fields_to_parse, db_file);
+ optind++;
+ }
- for(f = 0; f < nb_fields_to_parse; f++) {
- fclose(db_files[f]);
+ fclose(db_file);
+
+ for(f = 0; f < nb_fields_to_parse; f++) {
+ regfree(&fields_to_parse[f].regexp);
+ }
}
}
- free(db_files);
+ else {
+ if(search_pattern) {
+ char *search_name;
+ char *search_regexp;
+ search_name = search_pattern;
+ search_regexp = search_pattern;
+ while(*search_regexp && *search_regexp != ' ') search_regexp++;
+ *search_regexp = '\0'; search_regexp++;
+ while(*search_regexp && *search_regexp == ' ') search_regexp++;
+ if(!*search_regexp) {
+ fprintf(stderr,
+ "Syntax error in the search pattern.\n");
+ exit(EXIT_FAILURE);
+ }
+ printf("Starting search in %s for field \"%s\" matching \"%s\".\n",
+ db_filename,
+ search_name,
+ search_regexp);
+ free(search_pattern);
+ }
+ }
exit(EXIT_SUCCESS);
}
exit(EXIT_SUCCESS);
}