mirror of
https://salsa.debian.org/dskoll/remind.git
synced 2026-04-16 22:38:37 +02:00
Compare commits
45 Commits
06.00.02
...
06.01.00-B
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4574b552b6 | ||
|
|
21e0940257 | ||
|
|
7064893ff2 | ||
|
|
f8781276e2 | ||
|
|
b02f61ea05 | ||
|
|
60447d530d | ||
|
|
2835176ad3 | ||
|
|
b0784feb1a | ||
|
|
ef7021972e | ||
|
|
e449fcdfcf | ||
|
|
47a4456c20 | ||
|
|
e9ee7492f7 | ||
|
|
2baa0405f3 | ||
|
|
3425530c1c | ||
|
|
eeae3298ef | ||
|
|
4237dc4a3f | ||
|
|
faf8947dda | ||
|
|
41a3db3a37 | ||
|
|
f12bcf3fe6 | ||
|
|
f9261bb24f | ||
|
|
2ff9aedba5 | ||
|
|
1b793eff2e | ||
|
|
e4c41e0f45 | ||
|
|
9ec1006804 | ||
|
|
dd048c0557 | ||
|
|
dce1f282f4 | ||
|
|
7120d07d84 | ||
|
|
127358db02 | ||
|
|
a89aaf18b6 | ||
|
|
5734bd7524 | ||
|
|
dfabda7dee | ||
|
|
da146d7989 | ||
|
|
e147925462 | ||
|
|
703907c94d | ||
|
|
bcfee04cae | ||
|
|
5f9e71f9eb | ||
|
|
272336226e | ||
|
|
32f4b125b5 | ||
|
|
7979a69cb9 | ||
|
|
651368fedc | ||
|
|
fe002557cf | ||
|
|
d2785d909c | ||
|
|
c2345a240b | ||
|
|
5b6bf25a20 | ||
|
|
44f9f0f0d4 |
11
.gitignore
vendored
11
.gitignore
vendored
@@ -4,12 +4,12 @@
|
||||
.gitignore
|
||||
MYMETA.json
|
||||
MYMETA.yml
|
||||
Makefile
|
||||
TAGS
|
||||
autom4te.cache
|
||||
blib/
|
||||
config.log
|
||||
config.status
|
||||
gmon.out
|
||||
man/rem.1
|
||||
man/rem2ps.1
|
||||
man/remind.1
|
||||
@@ -18,6 +18,7 @@ pm_to_blib
|
||||
rem2html/Makefile
|
||||
rem2html/rem2html
|
||||
rem2html/rem2html.1
|
||||
rem2pdf/Makefile
|
||||
rem2pdf/Makefile.PL
|
||||
rem2pdf/Makefile.old
|
||||
rem2pdf/Makefile.top
|
||||
@@ -30,8 +31,8 @@ src/rem2ps
|
||||
src/remind
|
||||
src/test-*.out
|
||||
src/version.h
|
||||
tests/test.out
|
||||
www/Makefile
|
||||
gmon.out
|
||||
tests/once.timestamp
|
||||
src/xlat.c
|
||||
tests/once.timestamp
|
||||
tests/test.out
|
||||
tests/tz.out
|
||||
www/Makefile
|
||||
|
||||
13
Makefile
13
Makefile
@@ -39,14 +39,21 @@ install-stripped:
|
||||
@$(MAKE) -C rem2html install
|
||||
@$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE)
|
||||
|
||||
test:
|
||||
@$(MAKE) -C src -s test
|
||||
test: test-basic test-tz
|
||||
|
||||
test-tz:
|
||||
@$(MAKE) -C src -s all
|
||||
@$(MAKE) -C src -s test-tz
|
||||
|
||||
test-basic:
|
||||
@$(MAKE) -C src -s all
|
||||
@$(MAKE) -C src -s test-basic
|
||||
|
||||
cppcheck:
|
||||
@$(MAKE) -C src cppcheck
|
||||
|
||||
distclean: clean
|
||||
-rm -f config.cache config.log config.status src/Makefile src/version.h src/config.h tests/test.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf rem2html/rem2html
|
||||
-rm -f config.cache config.log config.status src/Makefile src/version.h src/config.h tests/test.out tests/tz.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf rem2html/rem2html
|
||||
-rm -f man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind
|
||||
-rm -rf autom4te.cache rem2html/Makefile rem2html/rem2html.1
|
||||
|
||||
|
||||
@@ -9,7 +9,14 @@ the GNU General Public License, Vesion 2.
|
||||
### Remind and Rem2PS
|
||||
|
||||
**remind** and **rem2ps** have no prerequisites beyond the standard C
|
||||
library and the standard math library.
|
||||
library and the standard math library. **remind** will make use of
|
||||
GNU Readline if you have it installed.
|
||||
|
||||
- On Debian-like systems, install GNU Readline as follows:
|
||||
|
||||
`apt install libreadline-dev`
|
||||
|
||||
- On RPM-based systems, you need `readline-devel`
|
||||
|
||||
### Rem2HTML and Rem2PDF
|
||||
|
||||
|
||||
18
configure
vendored
18
configure
vendored
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.72 for remind 06.00.02.
|
||||
# Generated by GNU Autoconf 2.72 for remind 06.01.00.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
|
||||
@@ -601,8 +601,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='remind'
|
||||
PACKAGE_TARNAME='remind'
|
||||
PACKAGE_VERSION='06.00.02'
|
||||
PACKAGE_STRING='remind 06.00.02'
|
||||
PACKAGE_VERSION='06.01.00'
|
||||
PACKAGE_STRING='remind 06.01.00'
|
||||
PACKAGE_BUGREPORT=''
|
||||
PACKAGE_URL='https://dianne.skoll.ca/projects/remind/'
|
||||
|
||||
@@ -1258,7 +1258,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
'configure' configures remind 06.00.02 to adapt to many kinds of systems.
|
||||
'configure' configures remind 06.01.00 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1320,7 +1320,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of remind 06.00.02:";;
|
||||
short | recursive ) echo "Configuration of remind 06.01.00:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1408,7 +1408,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
remind configure 06.00.02
|
||||
remind configure 06.01.00
|
||||
generated by GNU Autoconf 2.72
|
||||
|
||||
Copyright (C) 2023 Free Software Foundation, Inc.
|
||||
@@ -1871,7 +1871,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by remind $as_me 06.00.02, which was
|
||||
It was created by remind $as_me 06.01.00, which was
|
||||
generated by GNU Autoconf 2.72. Invocation command line was
|
||||
|
||||
$ $0$ac_configure_args_raw
|
||||
@@ -4848,7 +4848,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by remind $as_me 06.00.02, which was
|
||||
This file was extended by remind $as_me 06.01.00, which was
|
||||
generated by GNU Autoconf 2.72. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -4913,7 +4913,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config='$ac_cs_config_escaped'
|
||||
ac_cs_version="\\
|
||||
remind config.status 06.00.02
|
||||
remind config.status 06.01.00
|
||||
configured by $0, generated by GNU Autoconf 2.72,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_INIT(remind, 06.00.02, , , https://dianne.skoll.ca/projects/remind/)
|
||||
AC_INIT(remind, 06.01.00, , , https://dianne.skoll.ca/projects/remind/)
|
||||
AC_CONFIG_SRCDIR([src/queue.c])
|
||||
|
||||
cat <<'EOF'
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
"PSFILE" "PUSH" "PUSH-FUNCS" "PUSH-VARS" "PUSH-OMIT-CONTEXT" "REM" "RETURN"
|
||||
"RUN" "SATISFY" "SCAN" "SCANFROM" "SCHED" "SECOND" "SET"
|
||||
"SKIP" "SPECIAL" "SYSINCLUDE" "TAG" "THIRD" "THROUGH" "TODO"
|
||||
"TRANSLATE" "TRANS" "UNSET" "UNTIL" "WARN")
|
||||
"TRANSLATE" "TRANS" "TZ" "UNSET" "UNTIL" "WARN")
|
||||
#'(lambda (a b) (> (length a) (length b)))))
|
||||
|
||||
|
||||
@@ -179,9 +179,9 @@
|
||||
"realtoday" "rows" "sgn" "shell" "shellescape" "slide" "soleq"
|
||||
"stdout" "strlen" "substr" "sunrise" "sunset" "time" "timepart"
|
||||
"timezone" "today" "trig" "trigback" "trigbase" "trigcompletethrough" "trigdate" "trigdatetime"
|
||||
"trigdelta" "trigduration" "trigeventduration" "trigeventstart"
|
||||
"trigdelta" "trigduration" "trigeventduration" "trigeventstart" "trigeventstarttz"
|
||||
"trigfrom" "trigger" "triginfo" "trigistodo" "trigmaxoverdue" "trigpriority" "trigrep"
|
||||
"trigscanfrom" "trigtags" "trigtime" "trigtimedelta" "trigtimerep"
|
||||
"trigscanfrom" "trigtags" "trigtime" "trigtimedelta" "trigtimerep" "trigtimetz" "trigtz"
|
||||
"triguntil" "trigvalid" "typeof" "tzconvert" "upper" "utctolocal"
|
||||
"value" "version" "weekno" "wkday" "wkdaynum" "year"
|
||||
)
|
||||
|
||||
@@ -1,5 +1,16 @@
|
||||
CHANGES TO REMIND
|
||||
|
||||
* VERSION 6.1 Patch 0 - 2025-??-??
|
||||
|
||||
- MAJOR NEW FEATURE: remind: The TZ keyword lets you specify a time
|
||||
zone for a REM command. All trigger calculations are performed in
|
||||
the named time zone.
|
||||
|
||||
- BUG FIX: remind: If Remind was run interactively ("remind -c -" with
|
||||
readline support enabled) it would not properly cache the input
|
||||
file, but would keep asking for interactive input. This has been
|
||||
fixed.
|
||||
|
||||
* VERSION 6.0 Patch 2 - 2025-09-01
|
||||
|
||||
- CHANGE: Default $ParseUntriggered to 0 instead of 1. The default
|
||||
@@ -11,8 +22,8 @@ CHANGES TO REMIND
|
||||
- BUG FIX: remind: Don't add lines to "readline" history unless they
|
||||
are actually being read from standard input.
|
||||
|
||||
- BUG FIX: remind: On the command-line, make "-i$foo" behave the same
|
||||
way as "-i$foo=0" as was documented in the man page.
|
||||
- BUG FIX: remind: On the command-line, make '-i$foo' behave the same
|
||||
way as '-i$foo=0' as was documented in the man page.
|
||||
|
||||
- BUG FIX: remind: Clamp the output of trigger() to "1 January 1990 AT
|
||||
00:00" if the UTC flag is used, even if it would actually produce a
|
||||
|
||||
1
examples/alignment.rem
Normal file → Executable file
1
examples/alignment.rem
Normal file → Executable file
@@ -1,3 +1,4 @@
|
||||
#!/usr/bin/env -S remind -@2
|
||||
# Demo the columns() function
|
||||
#
|
||||
# Run as: remind -@2 alignment.rem
|
||||
|
||||
19
examples/tflag.rem
Executable file
19
examples/tflag.rem
Executable file
@@ -0,0 +1,19 @@
|
||||
#!/usr/bin/env -S remind -@2
|
||||
# This is a little Easter Egg that simply draws
|
||||
# the Transgender Pride Flag. It's included in
|
||||
# Remind because (1) the author is trans and (2)
|
||||
# trans people are under attack in the USA and many
|
||||
# other places. So this is a little show of support
|
||||
# and resistance for trans people.
|
||||
BANNER %
|
||||
SET $AddBlankLines 0
|
||||
REM SPECIAL COLOR 91 206 250 ██████████████████████████████████
|
||||
REM SPECIAL COLOR 91 206 250 ██████████████████████████████████
|
||||
REM SPECIAL COLOR 245 169 184 ██████████████████████████████████
|
||||
REM SPECIAL COLOR 245 169 184 ██████████████████████████████████
|
||||
REM SPECIAL COLOR 255 255 255 ██████████████████████████████████
|
||||
REM SPECIAL COLOR 255 255 255 ██████████████████████████████████
|
||||
REM SPECIAL COLOR 245 169 184 ██████████████████████████████████
|
||||
REM SPECIAL COLOR 245 169 184 ██████████████████████████████████
|
||||
REM SPECIAL COLOR 91 206 250 ██████████████████████████████████
|
||||
REM SPECIAL COLOR 91 206 250 ██████████████████████████████████
|
||||
@@ -547,9 +547,17 @@ will produce the following \fBinfo\fR hash:
|
||||
.PP
|
||||
.RE
|
||||
.TP
|
||||
.B tz \fIzone\fR
|
||||
If a non-empty TZ clause was present, this key will contain the time zone
|
||||
name.
|
||||
.TP
|
||||
.B time \fIt\fR
|
||||
If an AT clause was present, this key will contain the time of the AT clause
|
||||
in minutes after midnight.
|
||||
in minutes after midnight \fIin the system default time zone\fR.
|
||||
.TP
|
||||
.B time_in_tz \fIt\fR
|
||||
If a TZ clause was present, this key will contain the time of the AT clause
|
||||
in minutes after midnight \fIin the time zone specified by TZ\fR.
|
||||
.TP
|
||||
.B tdelta \fIn\fR
|
||||
If a time delta (+n after an AT clause) was present, this key contains the
|
||||
@@ -570,7 +578,12 @@ discussion of duration vs. event duration.
|
||||
.TP
|
||||
.B eventstart \fIdt\fR
|
||||
If an AT clause was present, this key contains the event start time in
|
||||
the format \fIYYYY-MM-DDTHH:MM\fR.
|
||||
the format \fIYYYY-MM-DD\fRT\fIHH:MM\fR in the \fIsystem default time zone\fR.
|
||||
.TP
|
||||
.B eventstart_in_tz \fIdt\fR
|
||||
If a TZ clause was present, this key containes the event start time in
|
||||
the format \fIYYYY-MM-DD\fRT\fIHH:MM\fR in the \fItime zone specified
|
||||
by TZ\fR.
|
||||
.TP
|
||||
.B back \fIn\fR
|
||||
If the reminder contained a "back" clause (\-n or \-\-n), this key
|
||||
|
||||
121
man/remind.1.in
121
man/remind.1.in
@@ -693,6 +693,7 @@ Its syntax is:
|
||||
[\fBSCANFROM\fR \fIscan_date\fR | \fBFROM\fR \fIstart_date\fR]
|
||||
[\fBDURATION\fR \fIduration\fR]
|
||||
[\fBTAG\fR \fItag\fR]
|
||||
[\fBTZ\fR \fItimezone\fR]
|
||||
[\fBINFO\fR "\fIinfo_string\fR"]
|
||||
\fBMSG\fR | \fBMSF\fR | \fBRUN\fR | \fBCAL\fR | \fBSATISFY\fR |
|
||||
\fBSPECIAL\fR \fIspecial\fR | \fBPS\fR | \fBPSFILE\fR
|
||||
@@ -2206,6 +2207,81 @@ the first day of the month. The local \fBOMIT\fR keyword causes the
|
||||
Finally, the \fBAFTER\fR keyword will keep moving the reminder forward
|
||||
until it has passed any holidays specified with global \fBOMIT\fR
|
||||
commands.
|
||||
.PP
|
||||
.SH TIMEZONE SUPPORT
|
||||
.PP
|
||||
The \fBREM\fR command supports an optional \fBTZ\fR keyword, which should
|
||||
be followed by the \fIcase-sensitive\fR time zone name in which the
|
||||
command is to be interpreted. Note that if you use the \fBTZ\fR keyword,
|
||||
then you \fImust also\fR use an \fBAT\fR clause. Here are some examples:
|
||||
.PP
|
||||
.nf
|
||||
REM Wednesday AT 14:00 TZ America/Toronto MSG 2PM Eastern (%2).
|
||||
REM Wednesday AT 23:59 TZ America/Los_Angeles SATISFY [$Td == 13] MSG Foo %b %2.
|
||||
.fi
|
||||
.PP
|
||||
Within a \fBSATISFY\fR clause and an \fBOMITFUNC\fR function, all
|
||||
trigger functions and the trigger date are interpreted \fIin the time
|
||||
zone specified in the \fBREM\fI command\fR. Outside the \fBREM\fR
|
||||
command, however, trigger functions are adjusted to the local time
|
||||
zone. If the local time zone is UTC and we feed \fBRemind\fR the
|
||||
following file on 2025-09-04 UTC:
|
||||
.PP
|
||||
.nf
|
||||
SET $AddBlankLines 0
|
||||
BANNER %
|
||||
REM Wednesday AT 14:00 TZ America/Toronto MSG 2PM Eastern (%2).
|
||||
set a $T
|
||||
set b $Tt
|
||||
REM MSG a = [a], b = [b]
|
||||
REM Wednesday AT 23:59 TZ America/Los_Angeles SATISFY [$Td == 13] MSG Foo %b %2.
|
||||
set c $T
|
||||
set d $Tt
|
||||
REM MSG c = [c], d = [d]
|
||||
.fi
|
||||
.PP
|
||||
Then the output is as follows:
|
||||
.PP
|
||||
.nf
|
||||
a = 2025-09-10, b = 18:00
|
||||
c = 2026-05-14, d = 06:59
|
||||
.fi
|
||||
.PP
|
||||
That is because the trigger date of the first (Wednesday, 2025-09-10
|
||||
at 14:00 Eastern time) is 2025-09-10 at 18:00 UTC. In the second case,
|
||||
Wednesday, 13 May 2026 is the SATISFied trigger date, which is
|
||||
adjusted to Thursday, 14 May 2026 at 06:59 UTC because of the
|
||||
time zone adjustment.
|
||||
.PP
|
||||
If you use an invalid time zone name after the \fBTZ\fR keyword,
|
||||
results are undefined. Unfortunately, \fBRemind\fR cannot diagnose
|
||||
this error becase the C library \fBtzset()\fR function has no
|
||||
error return.
|
||||
.PP
|
||||
In a reminder with the \fBTZ\fR keyword, OMIT dates are evaluated in
|
||||
the specified time zone. Here's an example: Suppose the local time zone
|
||||
is America/Toronto and you have this script:
|
||||
.PP
|
||||
.nf
|
||||
# A Friday
|
||||
OMIT 2025-09-05
|
||||
|
||||
# A Saturday
|
||||
OMIT 2025-09-13
|
||||
|
||||
REM Saturday AT 01:00 TZ Europe/Amsterdam SKIP MSG Early Sat AM
|
||||
.fi
|
||||
.PP
|
||||
On 2025-09-05 in the America/Toronto time zone, the reminder \fIwill\fR
|
||||
trigger. Even though 2025-09-05 has been OMITted, the SKIP keyword
|
||||
evaluates the date in the Europe/Amsterdam time zone, and 2025-09-06
|
||||
(the trigger date) is \fInot\fR omitted.
|
||||
.PP
|
||||
Conversely, on 2025-09-12 in the America/Toronto time zone, the
|
||||
reminder will \fInot\fR trigger. Even though 2025-09-12 is not OMITted,
|
||||
2025-09-13 is, and that is the trigger date in the Europe/Amsterdam
|
||||
time zone.
|
||||
.PP
|
||||
.SH THE DO, INCLUDE AND SYSINCLUDE COMMANDS
|
||||
.PP
|
||||
\fBRemind\fR allows you to include other files in your reminder script,
|
||||
@@ -3273,10 +3349,10 @@ A directory path containing standard reminder scripts. Currently,
|
||||
The value of \fB$SysInclude\fR is "@prefix@/share/remind" on
|
||||
this installation.
|
||||
.TP
|
||||
.B $T (read-only, DATE type)
|
||||
.B $T (read-only, DATE or INT type)
|
||||
Equivalent to \fBtrigdate()\fR. (See BUILT-IN FUNCTIONS.)
|
||||
.TP
|
||||
.B $Tb (read-only, DATE type)
|
||||
.B $Tb (read-only, DATE or INT type)
|
||||
Equivalent to \fBtrigbase()\fR.
|
||||
.TP
|
||||
.B $Td (read-only)
|
||||
@@ -3285,7 +3361,7 @@ Equivalent to \fBday(trigdate())\fR.
|
||||
.B $Tm (read-only)
|
||||
Equivalent to \fBmonnum(trigdate())\fR.
|
||||
.TP
|
||||
.B $Tu (read-only, DATE type)
|
||||
.B $Tu (read-only, DATE or INT type)
|
||||
Equivalent to \fBtriguntil()\fR.
|
||||
.TP
|
||||
.B $Tw (read-only)
|
||||
@@ -3294,7 +3370,7 @@ Equivalent to \fBwkdaynum(trigdate())\fR.
|
||||
.B $Ty (read-only)
|
||||
Equivalent to \fByear(trigdate())\fR.
|
||||
.TP
|
||||
.B $Tt (read-only, TIME type)
|
||||
.B $Tt (read-only, TIME or INT type)
|
||||
Equivalent to \fBtrigtime()\fR.
|
||||
.TP
|
||||
.B $TimeSep (STRING type)
|
||||
@@ -4703,6 +4779,11 @@ have an \fBAT\fR clause, returns the integer -1 (and differs from
|
||||
\fBtrigdatetime()\fR in this respect.) See "MULTI-DAY EVENTS" for more
|
||||
information.
|
||||
.TP
|
||||
.B trigeventstarttz()
|
||||
Similar to \fBtrigeventstart()\fR but returns the DATETIME in the time
|
||||
zone specified by a TZ clause, if one was present. If no TZ clause
|
||||
was present, returns the same value as \fBtrigeventstart()\fR.
|
||||
.TP
|
||||
.B trigeventduration()
|
||||
Returns a \fBTIME\fR representing the duration of the most recent
|
||||
triggerable \fBREM\fR command that had an \fBAT\fR and a
|
||||
@@ -4753,6 +4834,11 @@ command. Returns a positive integer N if the "repeat" is of the form
|
||||
Similar to \fBtrigrep()\fR, but returns the repeat used in the \fBAT\fR clause
|
||||
of a timed reminder.
|
||||
.TP
|
||||
.B trigtz()
|
||||
If a \fBTZ\fR clause was used in the last \fBREM\fR or \fBIFTRIG\fR
|
||||
command, returns the time zone name. Otherwise returns the empty
|
||||
string.
|
||||
.TP
|
||||
.B trigduration()
|
||||
Returns (as a TIME type) the \fBDURATION\fR parameter of a timed
|
||||
reminder. If there is no \fBDURATION\fR parameter, returns the
|
||||
@@ -4852,11 +4938,16 @@ were no TAGs. If there are multiple tags, they are each separated by
|
||||
a single comma, not a comma and a space.
|
||||
.TP
|
||||
.B trigtime()
|
||||
Returns the time of the last \fBREM\fR command with an \fBAT\fR
|
||||
clause. If the last \fBREM\fR did not have an \fBAT\fR clause,
|
||||
returns the integer 0. If a \fBREM\fR command has an \fBAT\fR clause
|
||||
with a \fBDURATION\fR, then you can compute the end time as
|
||||
\fBtrigtime() + trigduration()\fR.
|
||||
Returns the time of the last \fBREM\fR command with an \fBAT\fR clause
|
||||
\fIin the system default time zone\fR. If the last \fBREM\fR did not
|
||||
have an \fBAT\fR clause, returns the integer 0. If a \fBREM\fR
|
||||
command has an \fBAT\fR clause with a \fBDURATION\fR, then you can
|
||||
compute the end time as \fBtrigtime() + trigduration()\fR.
|
||||
.TP
|
||||
.B trigtimetz()
|
||||
Similar to \fBtrigtime()\fR but returns the time in the time zone specified
|
||||
by a TZ clause, if one was present. If no TZ clause was present, returns
|
||||
the same value as \fBtrigtime()\fR.
|
||||
.TP
|
||||
.B trigvalid()
|
||||
Returns 1 if the value returned by \fBtrigdate()\fR is valid for the most
|
||||
@@ -4873,11 +4964,13 @@ command can never be triggered:
|
||||
Returns "STRING", "INT", "DATE", "TIME" or "DATETIME", depending on the type of \fIarg\fR.
|
||||
.TP
|
||||
.B tzconvert(q_datetime, s_srczone [,s_dstzone])
|
||||
Converts \fBdatetime\fR from the time zone named by \fBsrczone\fR to the
|
||||
time zone named by \fBdstzone\fR. If \fBdstzone\fR is omitted, the
|
||||
default system time zone is used. The return value is a DATETIME. Time
|
||||
zone names are system-dependent; consult your operating system for legal
|
||||
values. Here is an example:
|
||||
Converts \fBdatetime\fR from the time zone named by \fBsrczone\fR to
|
||||
the time zone named by \fBdstzone\fR. If \fBsrczone\fR is the empty
|
||||
string, then the default system time zone is used as the source zone.
|
||||
If \fBdstzone\fR is omitted or is the empty string, the default system
|
||||
time zone is used as the destination zone. The return value is a
|
||||
DATETIME. Time zone names are system-dependent; consult your
|
||||
operating system for legal values. Here is an example:
|
||||
.PP
|
||||
.nf
|
||||
tzconvert('2007-07-08@01:14', "Canada/Eastern", "Canada/Pacific")
|
||||
|
||||
@@ -40,9 +40,14 @@ REMINDOBJS= $(REMINDSRCS:.c=.o) $(XLATSRC:.c=.o)
|
||||
|
||||
all: remind rem2ps
|
||||
|
||||
test: all
|
||||
test-basic: all
|
||||
@sh ../tests/test-rem
|
||||
|
||||
test-tz: all
|
||||
@sh ../tests/test-timezone-support
|
||||
|
||||
test: test-basic test-tz
|
||||
|
||||
.c.o:
|
||||
@CC@ -c @CPPFLAGS@ @CFLAGS@ @DEFS@ $(CEXTRA) -DSYSDIR=$(datarootdir)/remind -I. -I$(srcdir) $<
|
||||
|
||||
@@ -117,6 +122,8 @@ beta-tgz:
|
||||
gzip -f -v -9 remind-$(VERSION)-BETA-$(BETA).tar
|
||||
gpg --detach-sign -u dianne@skoll.ca remind-$(VERSION)-BETA-$(BETA).tar.gz
|
||||
|
||||
distro-beta: beta-tgz
|
||||
|
||||
#---------------- Stuff after this added by "make depend" -----------------
|
||||
|
||||
|
||||
|
||||
@@ -848,6 +848,9 @@ void ProduceCalendar(void)
|
||||
if (CalMonths) {
|
||||
FromDSE(DSEToday, &y, &m, &d);
|
||||
DSEToday = DSE(y, m, 1);
|
||||
LocalDSEToday = DSEToday;
|
||||
LocalSysTime = 0;
|
||||
SysTime = 0;
|
||||
GenerateCalEntries(-1);
|
||||
DidAMonth = 0;
|
||||
if (PsCal == PSCAL_LEVEL3) {
|
||||
@@ -862,8 +865,13 @@ void ProduceCalendar(void)
|
||||
}
|
||||
return;
|
||||
} else {
|
||||
if (MondayFirst) DSEToday -= (DSEToday%7);
|
||||
else DSEToday -= ((DSEToday+1)%7);
|
||||
if (MondayFirst) {
|
||||
DSEToday -= (DSEToday%7);
|
||||
LocalDSEToday -= (LocalDSEToday%7);
|
||||
} else {
|
||||
DSEToday -= ((DSEToday+1)%7);
|
||||
LocalDSEToday -= ((LocalDSEToday+1)%7);
|
||||
}
|
||||
|
||||
GenerateCalEntries(-1);
|
||||
|
||||
@@ -912,7 +920,7 @@ static void DoCalendarOneWeek(int nleft)
|
||||
int y, m, d, done, i, l, wd;
|
||||
char buf[128];
|
||||
int LinesWritten = 0;
|
||||
int OrigDse = DSEToday;
|
||||
int OrigDse = LocalDSEToday;
|
||||
|
||||
InitMoonsAndShades();
|
||||
/* Fill in the column entries */
|
||||
@@ -920,6 +928,7 @@ static void DoCalendarOneWeek(int nleft)
|
||||
ColToDay[i] = DayOf(DSEToday);
|
||||
GenerateCalEntries(i);
|
||||
DSEToday++;
|
||||
LocalDSEToday++;
|
||||
}
|
||||
|
||||
/* Figure out weekday of first column */
|
||||
@@ -1205,6 +1214,7 @@ static int WriteCalendarRow(void)
|
||||
GenerateCalEntries(i);
|
||||
ColToDay[i] = DayOf(DSEToday);
|
||||
DSEToday++;
|
||||
LocalDSEToday++;
|
||||
}
|
||||
|
||||
/* Output the entries */
|
||||
@@ -1932,6 +1942,17 @@ static int DoCalRem(ParsePtr p, int col)
|
||||
return r;
|
||||
}
|
||||
|
||||
if (trig.tz != NULL && tim.ttime == NO_TIME) {
|
||||
FreeTrig(&trig);
|
||||
return E_TZ_NO_AT;
|
||||
}
|
||||
|
||||
/* An empty string for time zone is just a missing time zone */
|
||||
if (trig.tz != NULL && !*trig.tz) {
|
||||
free( (void *) trig.tz);
|
||||
trig.tz = NULL;
|
||||
}
|
||||
|
||||
if (trig.typ == MSG_TYPE ||
|
||||
trig.typ == CAL_TYPE ||
|
||||
trig.typ == MSF_TYPE) {
|
||||
@@ -1951,7 +1972,9 @@ static int DoCalRem(ParsePtr p, int col)
|
||||
return E_EOLN;
|
||||
}
|
||||
if (trig.typ == SAT_TYPE) {
|
||||
EnterTimezone(trig.tz);
|
||||
r=DoSatRemind(&trig, &tim, p);
|
||||
ExitTimezone(trig.tz);
|
||||
if (r) {
|
||||
if (r == E_CANT_TRIG && trig.maybe_uncomputable) {
|
||||
r = OK;
|
||||
@@ -2019,7 +2042,9 @@ static int DoCalRem(ParsePtr p, int col)
|
||||
}
|
||||
} else {
|
||||
/* Calculate the trigger date */
|
||||
EnterTimezone(trig.tz);
|
||||
dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 1);
|
||||
ExitTimezone(trig.tz);
|
||||
if (r) {
|
||||
if (r == E_CANT_TRIG && trig.maybe_uncomputable) {
|
||||
r = OK;
|
||||
@@ -2029,6 +2054,9 @@ static int DoCalRem(ParsePtr p, int col)
|
||||
}
|
||||
}
|
||||
|
||||
/* Adjust trigger date/time to time zone */
|
||||
dse = AdjustTriggerForTimeZone(&trig, dse, &tim);
|
||||
|
||||
/* Add to global OMITs if so indicated */
|
||||
if (trig.addomit) {
|
||||
r = AddGlobalOmit(dse);
|
||||
@@ -2299,6 +2327,9 @@ static int DoCalRem(ParsePtr p, int col)
|
||||
e->nonconst_expr = nonconst_expr;
|
||||
e->if_depth = get_if_pointer() - get_base_if_pointer();
|
||||
e->trig = trig;
|
||||
if (e->trig.tz) {
|
||||
e->trig.tz = StrDup(e->trig.tz);
|
||||
}
|
||||
e->tt = tim;
|
||||
#ifdef REM_USE_WCHAR
|
||||
e->wc_pos = NULL;
|
||||
@@ -2395,6 +2426,9 @@ static void WriteSimpleEntryProtocol1(CalEntry const *e)
|
||||
void WriteJSONTimeTrigger(TimeTrig const *tt)
|
||||
{
|
||||
PrintJSONKeyPairTime("time", tt->ttime);
|
||||
if (tt->ttime != tt->ttime_orig) {
|
||||
PrintJSONKeyPairTime("time_in_tz", tt->ttime_orig);
|
||||
}
|
||||
PrintJSONKeyPairTime("nexttime", tt->nexttime);
|
||||
PrintJSONKeyPairInt("tdelta", tt->delta);
|
||||
PrintJSONKeyPairInt("trep", tt->rep);
|
||||
@@ -2526,6 +2560,10 @@ void WriteJSONTrigger(Trigger const *t, int include_tags)
|
||||
PrintJSONKeyPairDate("from", t->from);
|
||||
PrintJSONKeyPairInt("priority", t->priority);
|
||||
PrintJSONKeyPairDateTime("eventstart", t->eventstart);
|
||||
if (t->eventstart_orig != NO_TIME &&
|
||||
t->eventstart_orig != t->eventstart) {
|
||||
PrintJSONKeyPairDateTime("eventstart_in_tz", t->eventstart_orig);
|
||||
}
|
||||
if (t->eventduration != NO_TIME) {
|
||||
PrintJSONKeyPairInt("eventduration", t->eventduration);
|
||||
}
|
||||
@@ -2547,6 +2585,7 @@ void WriteJSONTrigger(Trigger const *t, int include_tags)
|
||||
}
|
||||
PrintJSONKeyPairString("tags", DBufValue(&(t->tags)));
|
||||
}
|
||||
PrintJSONKeyPairString("tz", t->tz);
|
||||
}
|
||||
|
||||
static void WriteSimpleEntryProtocol2(CalEntry *e)
|
||||
@@ -2569,6 +2608,9 @@ static void WriteSimpleEntryProtocol2(CalEntry *e)
|
||||
}
|
||||
if (e->time != NO_TIME) {
|
||||
PrintJSONKeyPairInt("time", e->time);
|
||||
if (e->tt.ttime_orig != e->tt.ttime) {
|
||||
PrintJSONKeyPairInt("time_in_tz", e->tt.ttime_orig);
|
||||
}
|
||||
if (e->tt.delta) {
|
||||
PrintJSONKeyPairInt("tdelta", e->tt.delta);
|
||||
}
|
||||
|
||||
167
src/dorem.c
167
src/dorem.c
@@ -18,6 +18,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "types.h"
|
||||
#include "globals.h"
|
||||
@@ -32,6 +33,126 @@ static int ParseUntil (ParsePtr s, Trigger *t, int type);
|
||||
static int ShouldTriggerBasedOnWarn (Trigger const *t, int dse, int *err);
|
||||
static int ComputeTrigDuration(TimeTrig const *t);
|
||||
|
||||
static int CalledEnterTimezone = 0;
|
||||
|
||||
int AdjustTriggerForTimeZone(Trigger *trig, int dse, TimeTrig *tim)
|
||||
{
|
||||
int y, m, d, hour, minute;
|
||||
int r;
|
||||
struct tm tm;
|
||||
if (!trig->tz || dse < 0) {
|
||||
/* Already local time or did not compute trigger date - no adjustments needed */
|
||||
return dse;
|
||||
}
|
||||
FromDSE(dse, &y, &m, &d);
|
||||
hour = tim->ttime_orig / 60;
|
||||
minute = tim->ttime_orig % 60;
|
||||
|
||||
r = tz_convert(y, m, d, hour, minute, trig->tz, LocalTimeZone, &tm);
|
||||
if (r != 1) {
|
||||
Wprint(tr("Error adjusting trigger to local time zone"));
|
||||
return dse;
|
||||
}
|
||||
|
||||
dse = DSE(tm.tm_year+1900, tm.tm_mon, tm.tm_mday);
|
||||
tim->ttime = tm.tm_hour * 60 + tm.tm_min;
|
||||
/* Adjust eventstart also */
|
||||
trig->eventstart = dse * MINUTES_PER_DAY + tim->ttime;
|
||||
SaveAllTriggerInfo(trig, tim, dse, tim->ttime, 1);
|
||||
if (DebugFlag & DB_PRTTRIG) {
|
||||
fprintf(ErrFp, "%s(%s): Trig(tz_adj %s) = %s, %d %s, %d AT %02d:%02d",
|
||||
GetCurrentFilename(), line_range(LineNoStart, LineNo), trig->tz,
|
||||
get_day_name(dse % 7), tm.tm_mday, get_month_name(tm.tm_mon),
|
||||
1900 + tm.tm_year, tim->ttime / 60, tim->ttime % 60);
|
||||
if (tim->duration != NO_TIME) {
|
||||
fprintf(ErrFp, " DURATION %02d:%02d",
|
||||
(tim->duration / 60),
|
||||
(tim->duration % 60));
|
||||
}
|
||||
fprintf(ErrFp, "\n");
|
||||
}
|
||||
return dse;
|
||||
}
|
||||
|
||||
void ExitTimezone(char const *tz)
|
||||
{
|
||||
if (!CalledEnterTimezone) {
|
||||
fprintf(stderr, "ExitTimezone called without EnterTimezone!!!\n");
|
||||
abort();
|
||||
}
|
||||
CalledEnterTimezone = 0;
|
||||
if (!tz || !*tz) {
|
||||
/* Nothing to do */
|
||||
return;
|
||||
}
|
||||
/* Revert to our local time zone */
|
||||
(void) tz_set_tz(LocalTimeZone);
|
||||
|
||||
DSEToday = LocalDSEToday;
|
||||
SysTime = LocalSysTime;
|
||||
FromDSE(DSEToday, &CurYear, &CurMon, &CurDay);
|
||||
|
||||
if (DebugFlag & DB_SWITCH_ZONE) {
|
||||
fprintf(stderr, "TZ exit %s: %04d-%02d-%02d %02d:%02d\n", tz,
|
||||
CurYear, CurMon+1, CurDay, SysTime / 3600, (SysTime/60) % 60);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
void EnterTimezone(char const *tz)
|
||||
{
|
||||
struct tm tm;
|
||||
int y, m, d;
|
||||
time_t t;
|
||||
|
||||
if (CalledEnterTimezone) {
|
||||
fprintf(stderr, "EnterTimezone called twice in a row!!!\n");
|
||||
abort();
|
||||
}
|
||||
|
||||
CalledEnterTimezone = 1;
|
||||
|
||||
if (!tz || !*tz) {
|
||||
/* Stay in local timezone */
|
||||
return;
|
||||
}
|
||||
|
||||
FromDSE(LocalDSEToday, &y, &m, &d);
|
||||
tm.tm_sec = 0;
|
||||
tm.tm_min = (LocalSysTime/60) % 60;
|
||||
tm.tm_hour = LocalSysTime / 3600;
|
||||
tm.tm_mday = d;
|
||||
tm.tm_mon = m;
|
||||
tm.tm_year = y - 1900;
|
||||
tm.tm_wday = 0; /* Ignored by mktime */
|
||||
tm.tm_yday = 0; /* Ignored by mktime */
|
||||
tm.tm_isdst = -1; /* Information not available */
|
||||
|
||||
t = mktime(&tm); /* Convert local time to seconds */
|
||||
|
||||
/* Set target timezone */
|
||||
(void) tz_set_tz(tz);
|
||||
|
||||
/* Update our variables */
|
||||
(void) localtime_r(&t, &tm);
|
||||
|
||||
SysTime = tm.tm_min * 60 + (tm.tm_hour * 3600);
|
||||
CurDay = tm.tm_mday;
|
||||
CurMon = tm.tm_mon;
|
||||
CurYear = tm.tm_year + 1900;
|
||||
/* Adjust DSEToday back by a day if midnight in our time zone requires it */
|
||||
if (SysTime < LocalSysTime) {
|
||||
DSEToday--;
|
||||
FromDSE(DSEToday, &CurYear, &CurMon, &CurDay);
|
||||
}
|
||||
|
||||
if (DebugFlag & DB_SWITCH_ZONE) {
|
||||
fprintf(stderr, "TZ enter %s: %04d-%02d-%02d %02d:%02d\n", tz,
|
||||
CurYear, CurMon+1, CurDay, SysTime / 3600, (SysTime/60) % 60);
|
||||
}
|
||||
}
|
||||
|
||||
void remove_trailing_newlines(DynamicBuffer *buf)
|
||||
{
|
||||
char *s = (char *) DBufValue(buf) + DBufLen(buf) - 1;
|
||||
@@ -287,6 +408,18 @@ int DoRem(ParsePtr p)
|
||||
return r;
|
||||
}
|
||||
|
||||
if (trig.tz != NULL && tim.ttime == NO_TIME) {
|
||||
PurgeEchoLine("%s\n", CurLine);
|
||||
FreeTrig(&trig);
|
||||
return E_TZ_NO_AT;
|
||||
}
|
||||
|
||||
/* An empty string for time zone is just a missing time zone */
|
||||
if (trig.tz != NULL && !*trig.tz) {
|
||||
free( (void *) trig.tz);
|
||||
trig.tz = NULL;
|
||||
}
|
||||
|
||||
if (trig.complete_through != NO_DATE && !trig.is_todo) {
|
||||
PurgeEchoLine("%s\n", CurLine);
|
||||
FreeTrig(&trig);
|
||||
@@ -312,7 +445,9 @@ int DoRem(ParsePtr p)
|
||||
PurgeEchoLine("%s\n", "#!P: Cannot purge SATISFY-type reminders");
|
||||
}
|
||||
PurgeEchoLine("%s\n", CurLine);
|
||||
EnterTimezone(trig.tz);
|
||||
r=DoSatRemind(&trig, &tim, p);
|
||||
ExitTimezone(trig.tz);
|
||||
if (r) {
|
||||
if (r == E_CANT_TRIG && trig.maybe_uncomputable) {
|
||||
r = OK;
|
||||
@@ -372,7 +507,9 @@ int DoRem(ParsePtr p)
|
||||
}
|
||||
} else {
|
||||
/* Calculate the trigger date */
|
||||
EnterTimezone(trig.tz);
|
||||
dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 1);
|
||||
ExitTimezone(trig.tz);
|
||||
if (r) {
|
||||
if (PurgeMode) {
|
||||
if (!Hush) {
|
||||
@@ -388,6 +525,9 @@ int DoRem(ParsePtr p)
|
||||
}
|
||||
}
|
||||
|
||||
/* Adjust trigger date/time to time zone */
|
||||
dse = AdjustTriggerForTimeZone(&trig, dse, &tim);
|
||||
|
||||
/* Add to global OMITs if so indicated */
|
||||
if (trig.addomit) {
|
||||
r = AddGlobalOmit(dse);
|
||||
@@ -437,6 +577,7 @@ int DoRem(ParsePtr p)
|
||||
}
|
||||
|
||||
r = OK;
|
||||
|
||||
if (ShouldTriggerReminder(&trig, &tim, dse, &err)) {
|
||||
/* Filter unwanted events/todos */
|
||||
if (todo_filtered(&trig)) {
|
||||
@@ -479,6 +620,9 @@ int DoRem(ParsePtr p)
|
||||
}
|
||||
if (tim.ttime != NO_TIME) {
|
||||
PrintJSONKeyPairInt("time", tim.ttime);
|
||||
if (tim.ttime_orig != tim.ttime) {
|
||||
PrintJSONKeyPairInt("time_in_tz", tim.ttime_orig);
|
||||
}
|
||||
}
|
||||
if (p->nonconst_expr) {
|
||||
PrintJSONKeyPairInt("nonconst_expr", 1);
|
||||
@@ -664,11 +808,13 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
|
||||
trig->omitfunc[0] = 0;
|
||||
trig->duration_days = 0;
|
||||
trig->eventstart = NO_TIME;
|
||||
trig->eventstart_orig = NO_TIME;
|
||||
trig->eventduration = NO_TIME;
|
||||
trig->maybe_uncomputable = 0;
|
||||
DBufInit(&(trig->tags));
|
||||
trig->passthru[0] = 0;
|
||||
tim->ttime = NO_TIME;
|
||||
tim->ttime_orig = NO_TIME;
|
||||
tim->delta = DefaultTDelta;
|
||||
tim->rep = NO_REP;
|
||||
tim->duration = NO_TIME;
|
||||
@@ -678,6 +824,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
|
||||
trig->complete_through = NO_DATE;
|
||||
trig->adj_for_last = 0;
|
||||
trig->infos = NULL;
|
||||
trig->tz = NULL;
|
||||
|
||||
int parsing = 1;
|
||||
while(parsing) {
|
||||
@@ -740,6 +887,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
|
||||
trig->m = m;
|
||||
trig->d = d;
|
||||
tim->ttime = (tok.val % MINUTES_PER_DAY);
|
||||
tim->ttime_orig = tim->ttime;
|
||||
break;
|
||||
|
||||
case T_WkDay:
|
||||
@@ -795,6 +943,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
|
||||
DBufFree(&buf);
|
||||
if (tim->ttime != NO_TIME) return E_TIME_TWICE;
|
||||
tim->ttime = tok.val;
|
||||
tim->ttime_orig = tok.val;
|
||||
r = ParseTimeTrig(s, tim);
|
||||
if (r) return r;
|
||||
trig->duration_days = ComputeTrigDuration(tim);
|
||||
@@ -951,6 +1100,22 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
|
||||
DBufFree(&buf);
|
||||
break;
|
||||
|
||||
case T_Tz:
|
||||
if (trig->tz) {
|
||||
return E_TZ_SPECIFIED_TWICE;
|
||||
}
|
||||
|
||||
r = ParseTokenOrQuotedString(s, &buf);
|
||||
if (r != OK) {
|
||||
return r;
|
||||
}
|
||||
trig->tz = StrDup(DBufValue(&buf));
|
||||
if (!trig->tz) {
|
||||
return E_NO_MEM;
|
||||
}
|
||||
DBufFree(&buf);
|
||||
break;
|
||||
|
||||
case T_Info:
|
||||
r = ParseQuotedString(s, &buf);
|
||||
if (r != OK) {
|
||||
@@ -1097,6 +1262,7 @@ static int ParseTimeTrig(ParsePtr s, TimeTrig *tim)
|
||||
DBufFree(&buf);
|
||||
if (tim->ttime != NO_TIME) return E_TIME_TWICE;
|
||||
tim->ttime = tok.val;
|
||||
tim->ttime_orig = tok.val;
|
||||
break;
|
||||
|
||||
case T_Delta:
|
||||
@@ -1817,6 +1983,7 @@ int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
|
||||
} else if (dse == start) {
|
||||
if (tt->ttime != NO_TIME) {
|
||||
trig->eventstart = MINUTES_PER_DAY * r + tt->ttime;
|
||||
trig->eventstart_orig = trig->eventstart;
|
||||
if (tt->duration != NO_TIME) {
|
||||
trig->eventduration = tt->duration;
|
||||
}
|
||||
|
||||
@@ -132,6 +132,8 @@
|
||||
#define E_COMPLETE_WITHOUT_TODO 108
|
||||
#define E_MAX_OVERDUE_TWICE 109
|
||||
#define E_MAX_OVERDUE_WITHOUT_TODO 110
|
||||
#define E_TZ_SPECIFIED_TWICE 111
|
||||
#define E_TZ_NO_AT 112
|
||||
|
||||
#ifdef MK_GLOBALS
|
||||
#undef EXTERN
|
||||
@@ -261,6 +263,8 @@ EXTERN char *ErrMsg[]
|
||||
/* E_COMPLETE_WITHOUT_TODO */ "COMPLETE-THROUGH specified without TODO",
|
||||
/* E_MAX_OVERDUE_TWICE */ "MAX-OVERDUE specified twice",
|
||||
/* E_MAX_OVERDUE_WITHOUT_TODO */ "MAX-OVERDUE specified without TODO",
|
||||
/* E_TZ_SPECIFIED_TWICE */ "TZ specified twice",
|
||||
/* E_TZ_NO_AT */ "TZ specified for non-timed reminder",
|
||||
}
|
||||
#endif /* MK_GLOBALS */
|
||||
;
|
||||
|
||||
11
src/files.c
11
src/files.c
@@ -304,6 +304,10 @@ static int ReadLineFromFile(int use_pclose)
|
||||
DBufFree(&LineBuffer);
|
||||
|
||||
LineNoStart = LineNo+1;
|
||||
|
||||
if (!fp) {
|
||||
return E_EOF;
|
||||
}
|
||||
while(fp) {
|
||||
#ifdef USE_READLINE
|
||||
if (IS_INTERACTIVE()) {
|
||||
@@ -454,6 +458,7 @@ static int OpenFile(char const *fname)
|
||||
fprintf(ErrFp, tr("Reading `%s': Found in cache"), fname);
|
||||
fprintf(ErrFp, "\n");
|
||||
}
|
||||
fp = NULL;
|
||||
CLine = h->cache;
|
||||
SetCurrentFilename(fname);
|
||||
LineNo = 0;
|
||||
@@ -671,6 +676,7 @@ static int PopFile(void)
|
||||
IncludeStruct *i;
|
||||
|
||||
pop_excess_ifs(FileName);
|
||||
fp = NULL;
|
||||
|
||||
if (!IStackPtr) return E_EOF;
|
||||
i = &IStack[IStackPtr-1];
|
||||
@@ -683,17 +689,16 @@ static int PopFile(void)
|
||||
RunDisabled = oldRunDisabled;
|
||||
}
|
||||
|
||||
if (IStackPtr <= 1) {
|
||||
if (TopLevel()) {
|
||||
IStackPtr = 0;
|
||||
return E_EOF;
|
||||
}
|
||||
|
||||
IStackPtr--;
|
||||
|
||||
LineNo = i->LineNo;
|
||||
LineNoStart = i->LineNoStart;
|
||||
set_base_if_pointer(i->base_if_pointer);
|
||||
CLine = i->CLine;
|
||||
fp = NULL;
|
||||
SetCurrentFilename(i->filename);
|
||||
if (!i->ownedByMe) {
|
||||
RunDisabled |= RUN_NOTOWNER;
|
||||
|
||||
81
src/funcs.c
81
src/funcs.c
@@ -181,6 +181,7 @@ static int FTrigduration (func_info *);
|
||||
static int FTriginfo (func_info *);
|
||||
static int FTrigeventduration(func_info *);
|
||||
static int FTrigeventstart (func_info *);
|
||||
static int FTrigeventstarttz (func_info *);
|
||||
static int FTrigfrom (func_info *);
|
||||
static int FTrigger (func_info *);
|
||||
static int FTrigistodo (func_info *);
|
||||
@@ -190,8 +191,10 @@ static int FTrigrep (func_info *);
|
||||
static int FTrigscanfrom (func_info *);
|
||||
static int FTrigtags (func_info *);
|
||||
static int FTrigtime (func_info *);
|
||||
static int FTrigtimetz (func_info *);
|
||||
static int FTrigtimedelta (func_info *);
|
||||
static int FTrigtimerep (func_info *);
|
||||
static int FTrigtz (func_info *);
|
||||
static int FTriguntil (func_info *);
|
||||
static int FTrigvalid (func_info *);
|
||||
static int FTypeof (func_info *);
|
||||
@@ -206,7 +209,6 @@ static int FWkdaynum (func_info *);
|
||||
static int FYear (func_info *);
|
||||
|
||||
static int SunStuff (int rise, double cosz, int dse);
|
||||
static int tz_set_tz (char const *tz);
|
||||
|
||||
/* Caches for extracting months, days, years from dates - may
|
||||
improve performance slightly. */
|
||||
@@ -357,6 +359,7 @@ BuiltinFunc Func[] = {
|
||||
{ "trigduration", 0, 0, 0, FTrigduration, NULL },
|
||||
{ "trigeventduration", 0, 0, 0, FTrigeventduration, NULL },
|
||||
{ "trigeventstart", 0, 0, 0, FTrigeventstart, NULL },
|
||||
{ "trigeventstarttz", 0, 0, 0, FTrigeventstarttz, NULL },
|
||||
{ "trigfrom", 0, 0, 0, FTrigfrom, NULL },
|
||||
{ "trigger", 1, 3, 0, FTrigger, NULL },
|
||||
{ "triginfo", 1, 1, 0, FTriginfo, NULL },
|
||||
@@ -369,6 +372,8 @@ BuiltinFunc Func[] = {
|
||||
{ "trigtime", 0, 0, 0, FTrigtime, NULL },
|
||||
{ "trigtimedelta",0, 0, 0, FTrigtimedelta, NULL },
|
||||
{ "trigtimerep", 0, 0, 0, FTrigtimerep, NULL },
|
||||
{ "trigtimetz", 0, 0, 0, FTrigtimetz, NULL },
|
||||
{ "trigtz", 0, 0, 0, FTrigtz, NULL },
|
||||
{ "triguntil", 0, 0, 0, FTriguntil, NULL },
|
||||
{ "trigvalid", 0, 0, 0, FTrigvalid, NULL },
|
||||
{ "typeof", 1, 1, 1, FTypeof, NULL },
|
||||
@@ -1956,6 +1961,14 @@ static int FTrigtimerep(func_info *info)
|
||||
return OK;
|
||||
}
|
||||
|
||||
static int FTrigtz(func_info *info)
|
||||
{
|
||||
if (!LastTrigger.tz) {
|
||||
return RetStrVal("", info);
|
||||
}
|
||||
return RetStrVal(LastTrigger.tz, info);
|
||||
}
|
||||
|
||||
static int FTrigeventduration(func_info *info)
|
||||
{
|
||||
if (LastTrigger.eventduration == NO_TIME) {
|
||||
@@ -1991,6 +2004,22 @@ static int FTrigeventstart(func_info *info)
|
||||
return OK;
|
||||
}
|
||||
|
||||
static int FTrigeventstarttz(func_info *info)
|
||||
{
|
||||
if (LastTrigger.eventstart == NO_TIME) {
|
||||
RetVal.type = INT_TYPE;
|
||||
RETVAL = -1;
|
||||
} else {
|
||||
RetVal.type = DATETIME_TYPE;
|
||||
if (LastTrigger.eventstart_orig != NO_TIME) {
|
||||
RETVAL = LastTrigger.eventstart_orig;
|
||||
} else {
|
||||
RETVAL = LastTrigger.eventstart;
|
||||
}
|
||||
}
|
||||
return OK;
|
||||
}
|
||||
|
||||
static int FTrigduration(func_info *info)
|
||||
{
|
||||
if (LastTimeTrig.duration == NO_TIME) {
|
||||
@@ -2077,6 +2106,22 @@ static int FTrigtime(func_info *info)
|
||||
return OK;
|
||||
}
|
||||
|
||||
static int FTrigtimetz(func_info *info)
|
||||
{
|
||||
if (LastTriggerTime != NO_TIME) {
|
||||
RetVal.type = TIME_TYPE;
|
||||
if (LastTimeTrig.ttime_orig != NO_TIME) {
|
||||
RETVAL = LastTimeTrig.ttime_orig;
|
||||
} else {
|
||||
RETVAL = LastTriggerTime;
|
||||
}
|
||||
} else {
|
||||
RetVal.type = INT_TYPE;
|
||||
RETVAL = 0;
|
||||
}
|
||||
return OK;
|
||||
}
|
||||
|
||||
static int FTrigdatetime(func_info *info)
|
||||
{
|
||||
if (!LastTrigValid) {
|
||||
@@ -3879,7 +3924,7 @@ static void unsetenv(char const *varname)
|
||||
/* Conversion between different timezones. */
|
||||
/* */
|
||||
/***************************************************************/
|
||||
static int tz_set_tz(char const *tz)
|
||||
int tz_set_tz(char const *tz)
|
||||
{
|
||||
int r;
|
||||
if (tz == NULL) {
|
||||
@@ -3892,7 +3937,7 @@ static int tz_set_tz(char const *tz)
|
||||
return r;
|
||||
}
|
||||
|
||||
static int tz_convert(int year, int month, int day,
|
||||
int tz_convert(int year, int month, int day,
|
||||
int hour, int minute,
|
||||
char const *src_tz, char const *tgt_tz,
|
||||
struct tm *tm)
|
||||
@@ -3919,9 +3964,12 @@ static int tz_convert(int year, int month, int day,
|
||||
old_tz = StrDup(old_tz);
|
||||
if (!old_tz) return E_NO_MEM;
|
||||
}
|
||||
if (tgt_tz == NULL) {
|
||||
if (tgt_tz == NULL || !*tgt_tz) {
|
||||
tgt_tz = old_tz;
|
||||
}
|
||||
if (src_tz == NULL || !*src_tz) {
|
||||
src_tz = old_tz;
|
||||
}
|
||||
|
||||
/* set source TZ */
|
||||
r = tz_set_tz(src_tz);
|
||||
@@ -4217,25 +4265,32 @@ FEvalTrig(func_info *info)
|
||||
DestroyParser(&p);
|
||||
return r;
|
||||
}
|
||||
if (trig.tz != NULL && tim.ttime == NO_TIME) {
|
||||
FreeTrig(&trig);
|
||||
return E_TZ_NO_AT;
|
||||
}
|
||||
if (trig.typ != NO_TYPE) {
|
||||
DestroyParser(&p);
|
||||
FreeTrig(&trig);
|
||||
return E_PARSE_ERR;
|
||||
}
|
||||
if (scanfrom == NO_DATE) {
|
||||
EnterTimezone(trig.tz);
|
||||
dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 0);
|
||||
ExitTimezone(trig.tz);
|
||||
} else {
|
||||
/* Hokey... */
|
||||
if (get_scanfrom(&trig) != DSEToday) {
|
||||
Wprint(tr("Warning: SCANFROM is ignored in two-argument form of evaltrig()"));
|
||||
}
|
||||
EnterTimezone(trig.tz);
|
||||
dse = ComputeTrigger(scanfrom, &trig, &tim, &r, 0);
|
||||
ExitTimezone(trig.tz);
|
||||
}
|
||||
if (r == E_CANT_TRIG && trig.maybe_uncomputable) {
|
||||
r = 0;
|
||||
dse = -1;
|
||||
}
|
||||
FreeTrig(&trig);
|
||||
DestroyParser(&p);
|
||||
if (r) return r;
|
||||
if (dse < 0) {
|
||||
@@ -4245,9 +4300,11 @@ FEvalTrig(func_info *info)
|
||||
RetVal.type = DATE_TYPE;
|
||||
RETVAL = dse;
|
||||
} else {
|
||||
dse = AdjustTriggerForTimeZone(&trig, dse, &tim);
|
||||
RetVal.type = DATETIME_TYPE;
|
||||
RETVAL = (MINUTES_PER_DAY * dse) + tim.ttime;
|
||||
}
|
||||
FreeTrig(&trig);
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -4276,6 +4333,10 @@ FMultiTrig(func_info *info)
|
||||
DestroyParser(&p);
|
||||
return r;
|
||||
}
|
||||
if (trig.tz != NULL && tim.ttime == NO_TIME) {
|
||||
FreeTrig(&trig);
|
||||
return E_TZ_NO_AT;
|
||||
}
|
||||
if (trig.typ != NO_TYPE) {
|
||||
DestroyParser(&p);
|
||||
FreeTrig(&trig);
|
||||
@@ -4286,6 +4347,9 @@ FMultiTrig(func_info *info)
|
||||
return E_PARSE_ERR;
|
||||
}
|
||||
dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 0);
|
||||
|
||||
/* multitrig only does untimed reminders, so no need to worry
|
||||
about time zones */
|
||||
DestroyParser(&p);
|
||||
|
||||
if (r != E_CANT_TRIG) {
|
||||
@@ -4333,18 +4397,25 @@ FTrig(func_info *info)
|
||||
DestroyParser(&p);
|
||||
return r;
|
||||
}
|
||||
if (trig.tz != NULL && tim.ttime == NO_TIME) {
|
||||
FreeTrig(&trig);
|
||||
return E_TZ_NO_AT;
|
||||
}
|
||||
if (trig.typ != NO_TYPE) {
|
||||
DestroyParser(&p);
|
||||
FreeTrig(&trig);
|
||||
return E_PARSE_ERR;
|
||||
}
|
||||
EnterTimezone(trig.tz);
|
||||
dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 0);
|
||||
ExitTimezone(trig.tz);
|
||||
DestroyParser(&p);
|
||||
|
||||
if (r == E_CANT_TRIG) {
|
||||
FreeTrig(&trig);
|
||||
continue;
|
||||
}
|
||||
dse = AdjustTriggerForTimeZone(&trig, dse, &tim);
|
||||
if (ShouldTriggerReminder(&trig, &tim, dse, &r)) {
|
||||
LastTrig = dse;
|
||||
RETVAL = dse;
|
||||
|
||||
@@ -47,6 +47,7 @@ EXTERN FILE *ErrFp;
|
||||
|
||||
EXTERN int DSEToday;
|
||||
EXTERN int RealToday;
|
||||
EXTERN int LocalDSEToday;
|
||||
EXTERN int CurDay;
|
||||
EXTERN int CurMon;
|
||||
EXTERN int CurYear;
|
||||
@@ -98,9 +99,11 @@ EXTERN INIT( int SortByPrio, SORT_NONE);
|
||||
EXTERN INIT( int UntimedBeforeTimed, 0);
|
||||
EXTERN INIT( int DefaultPrio, NO_PRIORITY);
|
||||
EXTERN INIT( int SysTime, -1);
|
||||
EXTERN INIT( int LocalSysTime, -1);
|
||||
EXTERN INIT( int ParseUntriggered, 0);
|
||||
|
||||
EXTERN char const *InitialFile;
|
||||
EXTERN char const *LocalTimeZone;
|
||||
EXTERN int FileAccessDate;
|
||||
|
||||
EXTERN INIT( int WeekdayOmits, 0);
|
||||
|
||||
31
src/init.c
31
src/init.c
@@ -177,8 +177,25 @@ void InitRemind(int argc, char const *argv[])
|
||||
int dse;
|
||||
int ttyfd;
|
||||
|
||||
/* Make sure remind is not installed set-uid or set-gid */
|
||||
if (getgid() != getegid() ||
|
||||
getuid() != geteuid()) {
|
||||
fprintf(ErrFp, "\nRemind should not be installed set-uid or set-gid.\nCHECK YOUR SYSTEM SECURITY.\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
dse = NO_DATE;
|
||||
|
||||
/* Initialize local time zone */
|
||||
LocalTimeZone = getenv("TZ");
|
||||
if (LocalTimeZone) {
|
||||
LocalTimeZone = StrDup(LocalTimeZone);
|
||||
if (!LocalTimeZone) {
|
||||
fprintf(stderr, "Out of memory!\n");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
/* Initialize variable hash table */
|
||||
InitVars();
|
||||
|
||||
@@ -203,13 +220,6 @@ void InitRemind(int argc, char const *argv[])
|
||||
|
||||
InitDedupeTable();
|
||||
|
||||
/* Make sure remind is not installed set-uid or set-gid */
|
||||
if (getgid() != getegid() ||
|
||||
getuid() != geteuid()) {
|
||||
fprintf(ErrFp, "\nRemind should not be installed set-uid or set-gid.\nCHECK YOUR SYSTEM SECURITY.\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
y = NO_YR;
|
||||
m = NO_MON;
|
||||
d = NO_DAY;
|
||||
@@ -221,7 +231,9 @@ void InitRemind(int argc, char const *argv[])
|
||||
fprintf(ErrFp, "\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
LocalSysTime = SystemTime(0);
|
||||
DSEToday = RealToday;
|
||||
LocalDSEToday = DSEToday;
|
||||
FromDSE(DSEToday, &CurYear, &CurMon, &CurDay);
|
||||
|
||||
/* Initialize Latitude and Longitude */
|
||||
@@ -646,6 +658,7 @@ void InitRemind(int argc, char const *argv[])
|
||||
case 'q': case 'Q': DebugFlag |= DB_TRANSLATE; break;
|
||||
case 'n': case 'N': DebugFlag |= DB_NONCONST; break;
|
||||
case 'u': case 'U': DebugFlag |= DB_UNUSED_VARS; break;
|
||||
case 'z': case 'Z': DebugFlag |= DB_SWITCH_ZONE; break;
|
||||
default:
|
||||
fprintf(ErrFp, GetErr(M_BAD_DB_FLAG), *(arg-1));
|
||||
fprintf(ErrFp, "\n");
|
||||
@@ -711,6 +724,7 @@ void InitRemind(int argc, char const *argv[])
|
||||
if (SysTime != -1L) Usage();
|
||||
else {
|
||||
SysTime = (long) tok.val * 60L;
|
||||
LocalSysTime = SysTime;
|
||||
DontQueue = 1;
|
||||
Daemon = 0;
|
||||
}
|
||||
@@ -720,6 +734,7 @@ void InitRemind(int argc, char const *argv[])
|
||||
if (SysTime != -1L) Usage();
|
||||
if (m != NO_MON || d != NO_DAY || y != NO_YR || dse != NO_DATE) Usage();
|
||||
SysTime = (tok.val % MINUTES_PER_DAY) * 60;
|
||||
LocalSysTime = SysTime;
|
||||
DontQueue = 1;
|
||||
Daemon = 0;
|
||||
dse = tok.val / MINUTES_PER_DAY;
|
||||
@@ -790,6 +805,7 @@ void InitRemind(int argc, char const *argv[])
|
||||
fprintf(ErrFp, "%s", BadDate);
|
||||
Usage();
|
||||
}
|
||||
LocalDSEToday = DSEToday;
|
||||
CurYear = y;
|
||||
CurMon = m;
|
||||
CurDay = d;
|
||||
@@ -1144,6 +1160,7 @@ ProcessLongOption(char const *arg)
|
||||
/* Update RealToday because of TestMode */
|
||||
RealToday = SystemDate(&CurYear, &CurMon, &CurDay);
|
||||
DSEToday = RealToday;
|
||||
LocalDSEToday = DSEToday;
|
||||
FromDSE(DSEToday, &CurYear, &CurMon, &CurDay);
|
||||
|
||||
return;
|
||||
|
||||
20
src/main.c
20
src/main.c
@@ -153,6 +153,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
DBufInit(&(LastTrigger.tags));
|
||||
LastTrigger.infos = NULL;
|
||||
LastTrigger.tz = NULL;
|
||||
ClearLastTriggers();
|
||||
|
||||
atexit(exitfunc);
|
||||
@@ -1290,7 +1291,9 @@ int DoIfTrig(ParsePtr p)
|
||||
} else {
|
||||
if ( (r=ParseRem(p, &trig, &tim)) ) return r;
|
||||
if (trig.typ != NO_TYPE) return E_PARSE_ERR;
|
||||
EnterTimezone(trig.tz);
|
||||
dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 1);
|
||||
ExitTimezone(trig.tz);
|
||||
if (r) {
|
||||
if (r != E_CANT_TRIG || !trig.maybe_uncomputable) {
|
||||
if (!Hush || r != E_RUN_DISABLED) {
|
||||
@@ -1299,6 +1302,9 @@ int DoIfTrig(ParsePtr p)
|
||||
}
|
||||
push_if(0, 0);
|
||||
} else {
|
||||
if (dse >= 0) {
|
||||
dse = AdjustTriggerForTimeZone(&trig, dse, &tim);
|
||||
}
|
||||
if (ShouldTriggerReminder(&trig, &tim, dse, &err)) {
|
||||
push_if(1, 0);
|
||||
} else {
|
||||
@@ -1439,6 +1445,11 @@ static int DoDebug(ParsePtr p)
|
||||
if (val) DebugFlag |= DB_UNUSED_VARS;
|
||||
else DebugFlag &= ~DB_UNUSED_VARS;
|
||||
break;
|
||||
case 'z':
|
||||
case 'Z':
|
||||
if (val) DebugFlag |= DB_SWITCH_ZONE;
|
||||
else DebugFlag &= ~DB_SWITCH_ZONE;
|
||||
break;
|
||||
default:
|
||||
Wprint(GetErr(M_BAD_DB_FLAG), ch);
|
||||
break;
|
||||
@@ -2039,6 +2050,10 @@ FreeTrig(Trigger *t)
|
||||
if (t->infos) {
|
||||
FreeTrigInfoChain(t->infos);
|
||||
}
|
||||
if (t->tz) {
|
||||
free( (void *) t->tz);
|
||||
}
|
||||
t->tz = NULL;
|
||||
t->infos = NULL;
|
||||
}
|
||||
|
||||
@@ -2069,7 +2084,9 @@ ClearLastTriggers(void)
|
||||
LastTrigger.complete_through = NO_DATE;
|
||||
LastTrigger.max_overdue = -1;
|
||||
FreeTrig(&LastTrigger);
|
||||
|
||||
LastTimeTrig.ttime = NO_TIME;
|
||||
LastTimeTrig.ttime_orig = NO_TIME;
|
||||
LastTimeTrig.delta = NO_DELTA;
|
||||
LastTimeTrig.rep = NO_REP;
|
||||
LastTimeTrig.duration = NO_TIME;
|
||||
@@ -2098,6 +2115,9 @@ SaveLastTrigger(Trigger const *t)
|
||||
LastTrigger.infos = NULL;
|
||||
DBufInit(&(LastTrigger.tags));
|
||||
|
||||
if (LastTrigger.tz) {
|
||||
LastTrigger.tz = StrDup(LastTrigger.tz);
|
||||
}
|
||||
DBufPuts(&(LastTrigger.tags), DBufValue(&(t->tags)));
|
||||
TrigInfo *cur = t->infos;
|
||||
while(cur) {
|
||||
|
||||
@@ -296,3 +296,8 @@ void remove_trailing_newlines(DynamicBuffer *buf);
|
||||
void set_cloexec(int fd);
|
||||
int system_to_stderr(char const *cmd);
|
||||
int system1(char const *cmd);
|
||||
int tz_set_tz (char const *tz);
|
||||
int tz_convert(int year, int month, int day, int hour, int minute, char const *src_tz, char const *tgt_tz, struct tm *tm);
|
||||
int AdjustTriggerForTimeZone(Trigger *trig, int dse, TimeTrig *tim);
|
||||
void EnterTimezone(char const *tz);
|
||||
void ExitTimezone(char const *tz);
|
||||
|
||||
@@ -123,6 +123,7 @@ Token TokArray[] = {
|
||||
{ "todo", 4, T_Todo, 0 },
|
||||
{ "translate", 5, T_Translate, 0 },
|
||||
{ "tuesday", 3, T_WkDay, 1 },
|
||||
{ "tz", 2, T_Tz, 0 },
|
||||
{ "unset", 5, T_UnSet, 0 },
|
||||
{ "until", 5, T_Until, 0 },
|
||||
{ "warn", 4, T_Warn, 0 },
|
||||
|
||||
@@ -453,6 +453,7 @@ AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int sav
|
||||
/* If we have an AT, save the original event start */
|
||||
if (tim->ttime != NO_TIME) {
|
||||
trig->eventstart = MINUTES_PER_DAY * r + tim->ttime;
|
||||
trig->eventstart_orig = trig->eventstart;
|
||||
if (tim->duration != NO_TIME) {
|
||||
trig->eventduration = tim->duration;
|
||||
}
|
||||
@@ -515,6 +516,7 @@ int ComputeTrigger(int today, Trigger *trig, TimeTrig *tim,
|
||||
if (r == today) {
|
||||
if (tim->ttime != NO_TIME) {
|
||||
trig->eventstart = MINUTES_PER_DAY * r + tim->ttime;
|
||||
trig->eventstart_orig = trig->eventstart;
|
||||
if (tim->duration != NO_TIME) {
|
||||
trig->eventduration = tim->duration;
|
||||
}
|
||||
@@ -613,6 +615,21 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig const *tim
|
||||
omit = 0;
|
||||
}
|
||||
|
||||
/** FIXME: If a timed reminder moves to yesterday because of a time
|
||||
zone adjustment, try again! */
|
||||
|
||||
if (trig->tz) {
|
||||
TimeTrig copy = *tim;
|
||||
int new_result;
|
||||
ExitTimezone(trig->tz);
|
||||
new_result = AdjustTriggerForTimeZone(trig, result, ©);
|
||||
EnterTimezone(trig->tz);
|
||||
if (new_result + duration_days < today) {
|
||||
nextstart = start+1;
|
||||
start = nextstart;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
/** FIXME: Fix bad interaction with SATISFY... need to rethink!!! */
|
||||
if (result+duration_days >= today &&
|
||||
(trig->skip != SKIP_SKIP || !omit)) {
|
||||
|
||||
@@ -141,6 +141,7 @@ typedef struct {
|
||||
int priority;
|
||||
int duration_days; /* Duration converted to days to search */
|
||||
int eventstart; /* Original event start (datetime) */
|
||||
int eventstart_orig; /* Original event start in TZ (datetime) */
|
||||
int eventduration; /* Original event duration (minutes) */
|
||||
int maybe_uncomputable; /* Suppress "can't compute trigger" warnings */
|
||||
int addomit; /* Add trigger date to global OMITs */
|
||||
@@ -152,10 +153,12 @@ typedef struct {
|
||||
DynamicBuffer tags;
|
||||
char passthru[PASSTHRU_LEN+1];
|
||||
TrigInfo *infos;
|
||||
char const *tz; /* Time Zone */
|
||||
} Trigger;
|
||||
|
||||
/* A time trigger */
|
||||
typedef struct {
|
||||
int ttime_orig;
|
||||
int ttime;
|
||||
int nexttime;
|
||||
int delta;
|
||||
@@ -226,6 +229,7 @@ typedef Parser *ParsePtr; /* Pointer to parser structure */
|
||||
#define DB_TRANSLATE 0x100
|
||||
#define DB_NONCONST 0x200
|
||||
#define DB_UNUSED_VARS 0x400
|
||||
#define DB_SWITCH_ZONE 0x800
|
||||
|
||||
/* Enumeration of the tokens */
|
||||
enum TokTypes
|
||||
@@ -239,8 +243,8 @@ enum TokTypes
|
||||
T_Omit, T_OmitFunc, T_Once, T_Ordinal, T_Pop, T_PopFuncs, T_PopVars,
|
||||
T_Preserve, T_Priority, T_Push, T_PushFuncs, T_PushVars, T_Rem,
|
||||
T_RemType, T_Rep, T_Return, T_Scanfrom, T_Sched, T_Set, T_Skip, T_Tag,
|
||||
T_Through, T_Time, T_Todo, T_Translate, T_UnSet, T_Until, T_Warn, T_WkDay,
|
||||
T_Year
|
||||
T_Through, T_Time, T_Todo, T_Translate, T_Tz, T_UnSet, T_Until, T_Warn,
|
||||
T_WkDay, T_Year,
|
||||
};
|
||||
|
||||
/* The structure of a token */
|
||||
|
||||
2
tests/Makefile
Normal file
2
tests/Makefile
Normal file
@@ -0,0 +1,2 @@
|
||||
%:
|
||||
@make -s -C.. $@
|
||||
@@ -33,7 +33,7 @@ fi
|
||||
alias remind="echo You should be using ../src/remind explicitly in test-rem >&2; exit 1"
|
||||
|
||||
# Set a known timezone so moon phases show up in predictable places
|
||||
TZ=UTC
|
||||
TZ=Universal
|
||||
export TZ
|
||||
|
||||
# If we're already in a utf-8 locale, do
|
||||
|
||||
160
tests/test-timezone-support
Executable file
160
tests/test-timezone-support
Executable file
@@ -0,0 +1,160 @@
|
||||
#!/bin/sh
|
||||
DIR=`dirname $0`
|
||||
cd $DIR
|
||||
if test $? != 0 ; then
|
||||
echo ""
|
||||
echo "Unable to cd $DIR" >&2
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test `id -u` = 0 ; then
|
||||
echo ""
|
||||
echo "*** Please do not run the test suite as root; it will fail."
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# We alias "remind" here so that we don't inadvertently add code that
|
||||
# runs the system-installed verion of Remind rather than
|
||||
# ../src/remind. This trick was suggested by Jochen Sprickerhof
|
||||
alias remind="echo You should be using ../src/remind explicitly in test-rem >&2; exit 1"
|
||||
|
||||
REMIND="../src/remind -h -q --flush"
|
||||
OUT=../tests/tz.out
|
||||
CMP=../tests/tz.cmp
|
||||
|
||||
echo -n "" > $OUT 2>&1
|
||||
|
||||
TZ=Europe/Amsterdam $REMIND - 2025-09-03@14:00 <<'EOF' >> $OUT 2>&1
|
||||
SET $AddBlankLines=0
|
||||
BANNER %
|
||||
REM Fri AT 23:30 TZ America/Toronto +1000 SATISFY [$Td == 13] MSG Fri 13th @23:30 Eastern is %a %2 here
|
||||
DEBUG +x
|
||||
SET a $T
|
||||
SET b $Tt
|
||||
SET c trigtz()
|
||||
SET d trigtime()
|
||||
SET e trigtimetz()
|
||||
SET f trigeventstart()
|
||||
SET g trigeventstarttz()
|
||||
DEBUG -x
|
||||
EOF
|
||||
|
||||
TZ=Europe/Amsterdam $REMIND - 2026-02-14@14:00 <<'EOF' >> $OUT 2>&1
|
||||
SET $AddBlankLines=0
|
||||
BANNER %
|
||||
REM Fri AT 23:30 TZ America/Toronto +1000 SATISFY [$Td == 13] MSG Fri 13th @23:30 Eastern is %a %2 here
|
||||
DEBUG +x
|
||||
SET a $T
|
||||
SET b $Tt
|
||||
SET c trigtz()
|
||||
SET d trigtime()
|
||||
SET e trigtimetz()
|
||||
SET f trigeventstart()
|
||||
SET g trigeventstarttz()
|
||||
DEBUG -x
|
||||
EOF
|
||||
|
||||
TZ=Europe/Amsterdam $REMIND - 2026-02-15@14:00 <<'EOF' >> $OUT 2>&1
|
||||
SET $AddBlankLines=0
|
||||
BANNER %
|
||||
REM Fri AT 23:30 TZ America/Toronto +1000 SATISFY [$Td == 13] MSG Fri 13th @23:30 Eastern is %a %2 here
|
||||
SET a $T
|
||||
SET b $Tt
|
||||
SET c trigtz()
|
||||
SET d trigtime()
|
||||
SET e trigtimetz()
|
||||
SET f trigeventstart()
|
||||
SET g trigeventstarttz()
|
||||
EOF
|
||||
|
||||
TZ=America/Toronto $REMIND -p12 - 2025-01-01 <<'EOF' 2>&1 | grep Locally >> $OUT 2>&1
|
||||
REM Second Thursday AT 15:00 TZ Europe/Amsterdam MSG Locally: %3
|
||||
EOF
|
||||
|
||||
TZ=America/Toronto $REMIND -g - 2026-01-01 <<'EOF' >> $OUT 2>&1
|
||||
BANNER %
|
||||
SET $AddBlankLines 0
|
||||
SET new '2026-01-18@14:53'
|
||||
SET first '2026-01-25@23:48'
|
||||
SET full '2026-01-03@05:04'
|
||||
SET last '2026-01-10@10:49'
|
||||
|
||||
REM [new] +100 MSG New Moon %*l %3.
|
||||
|
||||
SET a trigtz()
|
||||
SET b trigtime()
|
||||
SET c trigtimetz()
|
||||
SET d trigeventstart()
|
||||
SET e trigeventstarttz()
|
||||
|
||||
REM MSG trigtz = [a], trigtime = [b], trigtimetz = [c], trigeventstart = [d], trigeventstarttz = [e]
|
||||
|
||||
REM [first] +100 MSG First Quarter %*l %3.
|
||||
REM [full] +100 MSG Full Moon %*l %3.
|
||||
REM [last] +100 MSG Last Quarter %*l %3.
|
||||
|
||||
SET new tzconvert(new, "America/Toronto", "Australia/Sydney")
|
||||
SET first tzconvert(first, "America/Toronto", "Australia/Sydney")
|
||||
SET full tzconvert(full, "America/Toronto", "Australia/Sydney")
|
||||
SET last tzconvert(last, "America/Toronto", "Australia/Sydney")
|
||||
|
||||
REM [new] +100 TZ Australia/Sydney MSG New Moon %*l %3. (*)
|
||||
|
||||
SET a trigtz()
|
||||
SET b trigtime()
|
||||
SET c trigtimetz()
|
||||
SET d trigeventstart()
|
||||
SET e trigeventstarttz()
|
||||
|
||||
REM MSG trigtz = [a], trigtime = [b], trigtimetz = [c], trigeventstart = [d], trigeventstarttz = [e]
|
||||
|
||||
REM [first] +100 TZ Australia/Sydney MSG First Quarter %*l %3. (*)
|
||||
REM [full] +100 TZ Australia/Sydney MSG Full Moon %*l %3. (*)
|
||||
REM [last] +100 TZ Australia/Sydney MSG Last Quarter %*l %3. (*)
|
||||
|
||||
REM MSG new=[new] first=[first] full=[full] last=[last]
|
||||
|
||||
EOF
|
||||
|
||||
TZ=America/Los_Angeles $REMIND - 2026-01-01 <<'EOF' >> $OUT 2>&1
|
||||
BANNER %
|
||||
SET $AddBlankLines 0
|
||||
|
||||
REM AT 13:33 MSG Whatsup? %*l %3.
|
||||
REM AT 13:33 TZ "" MSG Whatsup? %*l %3.
|
||||
EOF
|
||||
|
||||
TZ=America/Los_Angeles $REMIND - 2026-01-01 <<'EOF' >> $OUT 2>&1
|
||||
BANNER %
|
||||
SET $AddBlankLines 0
|
||||
|
||||
REM AT 13:33 TZ America/Los_Angeles TZ Universal MSG Whatsup? %*l %3.
|
||||
REM AT 13:33 TZ "" TZ America/Los_Angeles MSG Whatsup? %*l %3.
|
||||
REM TZ Universal MSG Borked
|
||||
EOF
|
||||
|
||||
TZ=America/Toronto $REMIND -dx - <<'EOF' >> $OUT 2>&1
|
||||
SET a tzconvert('2025-09-01@14:44', "", "Europe/Berlin")
|
||||
SET a tzconvert('2025-09-01@14:44', "America/Toronto", "Europe/Berlin")
|
||||
SET a tzconvert('2025-09-01@14:44', "Europe/Berlin", "")
|
||||
SET a tzconvert('2025-09-01@14:44', "Europe/Berlin")
|
||||
SET a tzconvert('2025-09-01@14:44', "", "")
|
||||
SET a tzconvert('2025-09-01@14:44', "")
|
||||
EOF
|
||||
|
||||
cmp -s $OUT $CMP
|
||||
if [ "$?" = "0" ] ; then
|
||||
echo "Remind: Time zone test PASSED"
|
||||
exit 0
|
||||
else
|
||||
echo "Remind: Time zone test FAILED"
|
||||
echo "Examine the file tz.out to see where it differs from the"
|
||||
echo "reference file tz.cmp. Here are the first 200 lines of"
|
||||
echo "diff -u tz.out tz.cmp"
|
||||
echo ""
|
||||
diff -u $OUT $CMP | head -n 200
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
@@ -1045,7 +1045,7 @@ set a057 value("a05"+"6")
|
||||
"a05" + "6" => "a056"
|
||||
value("a056") => "SDFJHSDF KSJDFH KJSDFH KSJDFH"
|
||||
set a058 version()
|
||||
version() => "06.00.02"
|
||||
version() => "06.01.00"
|
||||
set a059 wkday(today())
|
||||
today() => 1991-02-16
|
||||
wkday(1991-02-16) => "Saturday"
|
||||
@@ -2608,7 +2608,7 @@ a056 "SDFJHSDF KSJDFH KJSDFH KSJDFH"
|
||||
a007 "1991-02-16"
|
||||
a057 "SDFJHSDF KSJDFH KJSDFH KSJDFH"
|
||||
a008 "11:44"
|
||||
a058 "06.00.02"
|
||||
a058 "06.01.00"
|
||||
a059 "Saturday"
|
||||
a010 12
|
||||
a060 6
|
||||
@@ -5561,8 +5561,8 @@ REM SATISFY ""
|
||||
REM SATISFY [version() > "01.00.00"]
|
||||
../tests/test.rem(1074): SATISFY: expression has no reference to trigdate() or $T...
|
||||
../tests/test.rem(1074): Trig = Saturday, 16 February, 1991
|
||||
version() => "06.00.02"
|
||||
"06.00.02" > "01.00.00" => 1
|
||||
version() => "06.01.00"
|
||||
"06.01.00" > "01.00.00" => 1
|
||||
../tests/test.rem(1074): Trig(satisfied) = Saturday, 16 February, 1991
|
||||
REM SATISFY [max(x, max(x, 1, 2, 3), 4, 5, 6) * 5]
|
||||
../tests/test.rem(1075): SATISFY: expression has no reference to trigdate() or $T...
|
||||
@@ -23658,7 +23658,7 @@ SECURITY: Won't read world-writable file or directory!
|
||||
Error reading include_dir/ww: Can't open file
|
||||
SECURITY: Won't read world-writable file or directory!
|
||||
Error reading include_dir/ww: No files matching *.rem
|
||||
06.00.02
|
||||
06.01.00
|
||||
Enabling test mode: This is meant for the acceptance test.
|
||||
Do not use --test in production.
|
||||
In test mode, the system time is fixed at 2025-01-06@19:00
|
||||
@@ -24485,6 +24485,7 @@ through
|
||||
todo
|
||||
trans
|
||||
translate
|
||||
tz
|
||||
unset
|
||||
until
|
||||
warn
|
||||
@@ -24642,6 +24643,7 @@ trigdelta
|
||||
trigduration
|
||||
trigeventduration
|
||||
trigeventstart
|
||||
trigeventstarttz
|
||||
trigfrom
|
||||
trigger
|
||||
triginfo
|
||||
@@ -24654,6 +24656,8 @@ trigtags
|
||||
trigtime
|
||||
trigtimedelta
|
||||
trigtimerep
|
||||
trigtimetz
|
||||
trigtz
|
||||
triguntil
|
||||
trigvalid
|
||||
typeof
|
||||
@@ -24987,6 +24991,8 @@ TRANSLATE "Time limit for expression evaluation exceeded" ""
|
||||
TRANSLATE "COMPLETE-THROUGH specified without TODO" ""
|
||||
TRANSLATE "MAX-OVERDUE specified twice" ""
|
||||
TRANSLATE "MAX-OVERDUE specified without TODO" ""
|
||||
TRANSLATE "TZ specified twice" ""
|
||||
TRANSLATE "TZ specified for non-timed reminder" ""
|
||||
|
||||
# Other Messages
|
||||
TRANSLATE "%s function `%s' defined at %s(%s) does not use its argument" ""
|
||||
@@ -25004,6 +25010,7 @@ TRANSLATE "Cannot stat %s - not running as daemon!" ""
|
||||
TRANSLATE "Cannot use AT clause in multitrig() function" ""
|
||||
TRANSLATE "Do not use ["["]] around expression in SET command" ""
|
||||
TRANSLATE "Duplicate INFO headers are not permitted" ""
|
||||
TRANSLATE "Error adjusting trigger to local time zone" ""
|
||||
TRANSLATE "Error: THROUGH date earlier than start date" ""
|
||||
TRANSLATE "Executing `%s' for INCLUDECMD and caching as `%s'" ""
|
||||
TRANSLATE "Found cached directory listing for `%s'" ""
|
||||
|
||||
51
tests/tz.cmp
Normal file
51
tests/tz.cmp
Normal file
@@ -0,0 +1,51 @@
|
||||
Fri 13th @23:30 Eastern is on Saturday, 14 February, 2026 at 5:30am here
|
||||
$T => 2026-02-14
|
||||
$Tt => 05:30
|
||||
trigtz() => "America/Toronto"
|
||||
trigtime() => 05:30
|
||||
trigtimetz() => 23:30
|
||||
trigeventstart() => 2026-02-14@05:30
|
||||
trigeventstarttz() => 2026-02-13@23:30
|
||||
Fri 13th @23:30 Eastern is today at 5:30am here
|
||||
$T => 2026-02-14
|
||||
$Tt => 05:30
|
||||
trigtz() => "America/Toronto"
|
||||
trigtime() => 05:30
|
||||
trigtimetz() => 23:30
|
||||
trigeventstart() => 2026-02-14@05:30
|
||||
trigeventstarttz() => 2026-02-13@23:30
|
||||
Fri 13th @23:30 Eastern is on Saturday, 14 March, 2026 at 4:30am here
|
||||
2025/01/09 * * * 540 9:00am Locally: at 09:00
|
||||
2025/02/13 * * * 540 9:00am Locally: at 09:00
|
||||
2025/03/13 * * * 600 10:00am Locally: at 10:00
|
||||
2025/04/10 * * * 540 9:00am Locally: at 09:00
|
||||
2025/05/08 * * * 540 9:00am Locally: at 09:00
|
||||
2025/06/12 * * * 540 9:00am Locally: at 09:00
|
||||
2025/07/10 * * * 540 9:00am Locally: at 09:00
|
||||
2025/08/14 * * * 540 9:00am Locally: at 09:00
|
||||
2025/09/11 * * * 540 9:00am Locally: at 09:00
|
||||
2025/10/09 * * * 540 9:00am Locally: at 09:00
|
||||
2025/11/13 * * * 540 9:00am Locally: at 09:00
|
||||
2025/12/11 * * * 540 9:00am Locally: at 09:00
|
||||
trigtz = , trigtime = 14:53, trigtimetz = 14:53, trigeventstart = 2026-01-18@14:53, trigeventstarttz = 2026-01-18@14:53
|
||||
trigtz = Australia/Sydney, trigtime = 14:53, trigtimetz = 06:53, trigeventstart = 2026-01-18@14:53, trigeventstarttz = 2026-01-19@06:53
|
||||
new=2026-01-19@06:53 first=2026-01-26@15:48 full=2026-01-03@21:04 last=2026-01-11@02:49
|
||||
Full Moon 2026-01-03 at 05:04.
|
||||
Full Moon 2026-01-03 at 05:04. (*)
|
||||
Last Quarter 2026-01-10 at 10:49.
|
||||
Last Quarter 2026-01-10 at 10:49. (*)
|
||||
New Moon 2026-01-18 at 14:53.
|
||||
New Moon 2026-01-18 at 14:53. (*)
|
||||
First Quarter 2026-01-25 at 23:48.
|
||||
First Quarter 2026-01-25 at 23:48. (*)
|
||||
Whatsup? today at 13:33.
|
||||
Whatsup? today at 13:33.
|
||||
-stdin-(4): TZ specified twice
|
||||
-stdin-(5): TZ specified twice
|
||||
-stdin-(6): TZ specified for non-timed reminder
|
||||
tzconvert(2025-09-01@14:44, "", "Europe/Berlin") => 2025-09-01@20:44
|
||||
tzconvert(2025-09-01@14:44, "America/Toronto", "Europe/Berlin") => 2025-09-01@20:44
|
||||
tzconvert(2025-09-01@14:44, "Europe/Berlin", "") => 2025-09-01@08:44
|
||||
tzconvert(2025-09-01@14:44, "Europe/Berlin") => 2025-09-01@08:44
|
||||
tzconvert(2025-09-01@14:44, "", "") => 2025-09-01@14:44
|
||||
tzconvert(2025-09-01@14:44, "") => 2025-09-01@14:44
|
||||
Reference in New Issue
Block a user