projects
/
mymail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the "48h" criterion and some clarifications in the man page.
[mymail.git]
/
mymail.c
diff --git
a/mymail.c
b/mymail.c
index
ef6e5c1
..
6e3f5cc
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,14
+55,14
@@
#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! */
int paranoid;
int quiet;
int ignore_dot_files;
/* Global variables! */
int paranoid;
int quiet;
int ignore_dot_files;
+regex_t leading_from_line_regexp;
+
/********************************************************************/
enum {
/********************************************************************/
enum {
@@
-155,11
+155,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
+184,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 {
@@
-704,6
+704,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 },