projects
/
mymail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved some of the non-global variables into main().
[mymail.git]
/
mymail.c
diff --git
a/mymail.c
b/mymail.c
index
2519a7a
..
bac2f45
100644
(file)
--- a/
mymail.c
+++ b/
mymail.c
@@
-55,18
+55,11
@@
regex_t leading_from_line_regexp;
regex_t leading_from_line_regexp;
-char *db_filename;
-char *db_filename_regexp_string;
-char *db_root_path;
-char *db_filename_list;
-char output_filename[PATH_MAX + 1];
+/* Global variables! */
int paranoid;
int paranoid;
-int action_index;
int quiet;
int quiet;
-time_t being_today;
-
/********************************************************************/
enum {
/********************************************************************/
enum {
@@
-709,12
+702,16
@@
void init_condition(struct search_condition *condition, char *string) {
condition->negation = 0;
}
condition->negation = 0;
}
- if(strcmp(search_field, "6h") == 0) {
+ /* Last 8 hours */
+
+ if(strcmp(search_field, "8h") == 0) {
condition->field_id = ID_INTERVAL;
condition->field_id = ID_INTERVAL;
- condition->interval_start = time(0) - 3600 *
6
;
+ condition->interval_start = time(0) - 3600 *
8
;
condition->interval_stop = 0;
}
condition->interval_stop = 0;
}
+ /* Today and yesterday */
+
else if(strcmp(search_field, "24h") == 0 ||
strcmp(search_field, "today") == 0) {
condition->field_id = ID_INTERVAL;
else if(strcmp(search_field, "24h") == 0 ||
strcmp(search_field, "today") == 0) {
condition->field_id = ID_INTERVAL;
@@
-722,6
+719,14
@@
void init_condition(struct search_condition *condition, char *string) {
condition->interval_stop = 0;
}
condition->interval_stop = 0;
}
+ else if(strcmp(search_field, "yesterday") == 0) {
+ condition->field_id = ID_INTERVAL;
+ condition->interval_start = time(0) - 2 * 3600 * 24;
+ condition->interval_stop = condition->interval_start + 3600 * 24;
+ }
+
+ /* Week days */
+
else if(strcmp(search_field, "monday") == 0) {
condition->field_id = ID_INTERVAL;
condition->interval_start = time_for_past_day(1);
else if(strcmp(search_field, "monday") == 0) {
condition->field_id = ID_INTERVAL;
condition->interval_start = time_for_past_day(1);
@@
-764,12
+769,6
@@
void init_condition(struct search_condition *condition, char *string) {
condition->interval_stop = condition->interval_start + 3600 * 24;
}
condition->interval_stop = condition->interval_start + 3600 * 24;
}
- else if(strcmp(search_field, "yesterday") == 0) {
- condition->field_id = ID_INTERVAL;
- condition->interval_start = time(0) - 2 * 3600 * 24;
- condition->interval_stop = condition->interval_start + 3600 * 24;
- }
-
else {
condition->field_id = -1;
else {
condition->field_id = -1;
@@
-809,6
+808,13
@@
void free_condition(struct search_condition *condition) {
/*********************************************************************/
int main(int argc, char **argv) {
/*********************************************************************/
int main(int argc, char **argv) {
+ char *db_filename;
+ char *db_filename_regexp_string;
+ char *db_root_path;
+ char *db_filename_list;
+ char output_filename[PATH_MAX + 1];
+ int action_index;
+
int error = 0, show_help = 0;
const int nb_fields_to_parse = sizeof(fields_to_parse) / sizeof(struct parsable_field);
char c;
int error = 0, show_help = 0;
const int nb_fields_to_parse = sizeof(fields_to_parse) / sizeof(struct parsable_field);
char c;