summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Henriksen <LarsHenriksen@get2net.dk>2018-11-18 18:32:11 +0100
committerLukas Fleischer <lfleischer@calcurse.org>2019-01-07 16:57:52 +0100
commit7851f46fbb1e84fe4fa62a36d1f79b936f040e66 (patch)
treec6b410dbde45fec292634b34d705fc563cbbb754
parent4ba2cc46d74a3b516046d1da565e4abb4dc1b196 (diff)
downloadcalcurse-7851f46fbb1e84fe4fa62a36d1f79b936f040e66.tar.gz
calcurse-7851f46fbb1e84fe4fa62a36d1f79b936f040e66.zip
CLI: filter options have no effect for dates before the epoch
With the exception of filter.type_mask, a filter is only applied if set explicitly on the command line with a filter option. Whether that is the case, is determined by comparison with the initialization value. For date related filters (start_from/to, end_from/to) that is -1, hence the criterion is != -1, not >= 0. In generel, a filter initialization value should be invalid (i.e. one that cannot be set explicitly). As times before the epoch (1 January 1970 00:00:00 UTC) are negative, -1 is a valid Unix time. However, as it cannot be set from the command line, it is probably no problem? Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk> Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
-rw-r--r--src/apoint.c8
-rw-r--r--src/event.c8
-rw-r--r--src/recur.c16
3 files changed, 16 insertions, 16 deletions
diff --git a/src/apoint.c b/src/apoint.c
index d200cf3..e8f9ee8 100644
--- a/src/apoint.c
+++ b/src/apoint.c
@@ -234,13 +234,13 @@ struct apoint *apoint_scan(FILE * f, struct tm start, struct tm end,
return NULL;
if (filter->regex && regexec(filter->regex, buf, 0, 0, 0))
return NULL;
- if (filter->start_from >= 0 && tstart < filter->start_from)
+ if (filter->start_from != -1 && tstart < filter->start_from)
return NULL;
- if (filter->start_to >= 0 && tstart > filter->start_to)
+ if (filter->start_to != -1 && tstart > filter->start_to)
return NULL;
- if (filter->end_from >= 0 && tend < filter->end_from)
+ if (filter->end_from != -1 && tend < filter->end_from)
return NULL;
- if (filter->end_to >= 0 && tend > filter->end_to)
+ if (filter->end_to != -1 && tend > filter->end_to)
return NULL;
}
diff --git a/src/event.c b/src/event.c
index c4c52db..fe8f883 100644
--- a/src/event.c
+++ b/src/event.c
@@ -183,13 +183,13 @@ struct event *event_scan(FILE * f, struct tm start, int id, char *note,
return NULL;
if (filter->regex && regexec(filter->regex, buf, 0, 0, 0))
return NULL;
- if (filter->start_from >= 0 && tstart < filter->start_from)
+ if (filter->start_from != -1 && tstart < filter->start_from)
return NULL;
- if (filter->start_to >= 0 && tstart > filter->start_to)
+ if (filter->start_to != -1 && tstart > filter->start_to)
return NULL;
- if (filter->end_from >= 0 && tend < filter->end_from)
+ if (filter->end_from != -1 && tend < filter->end_from)
return NULL;
- if (filter->end_to >= 0 && tend > filter->end_to)
+ if (filter->end_to != -1 && tend > filter->end_to)
return NULL;
}
diff --git a/src/recur.c b/src/recur.c
index e4cc1b2..ca99a21 100644
--- a/src/recur.c
+++ b/src/recur.c
@@ -397,13 +397,13 @@ struct recur_apoint *recur_apoint_scan(FILE * f, struct tm start,
return NULL;
if (filter->regex && regexec(filter->regex, buf, 0, 0, 0))
return NULL;
- if (filter->start_from >= 0 && tstart < filter->start_from)
+ if (filter->start_from != -1 && tstart < filter->start_from)
return NULL;
- if (filter->start_to >= 0 && tstart > filter->start_to)
+ if (filter->start_to != -1 && tstart > filter->start_to)
return NULL;
- if (filter->end_from >= 0 && tend < filter->end_from)
+ if (filter->end_from != -1 && tend < filter->end_from)
return NULL;
- if (filter->end_to >= 0 && tend > filter->end_to)
+ if (filter->end_to != -1 && tend > filter->end_to)
return NULL;
}
@@ -470,13 +470,13 @@ struct recur_event *recur_event_scan(FILE * f, struct tm start, int id,
return NULL;
if (filter->regex && regexec(filter->regex, buf, 0, 0, 0))
return NULL;
- if (filter->start_from >= 0 && tstart < filter->start_from)
+ if (filter->start_from != -1 && tstart < filter->start_from)
return NULL;
- if (filter->start_to >= 0 && tstart > filter->start_to)
+ if (filter->start_to != -1 && tstart > filter->start_to)
return NULL;
- if (filter->end_from >= 0 && tend < filter->end_from)
+ if (filter->end_from != -1 && tend < filter->end_from)
return NULL;
- if (filter->end_to >= 0 && tend > filter->end_to)
+ if (filter->end_to != -1 && tend > filter->end_to)
return NULL;
}