felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bugs where month numbers with leading zeros are misinterpreted as octal instead of decimal.

Browse Source 
Reported by Peter Geddes.
This commit is contained in:
Dianne Skoll
2020-09-13 12:34:27 -04:00
parent 0aa40094fa
commit fd39999128
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/tkremind
View File

@@ -2710,9 +2710,11 @@ proc ReadTaggedOptions { tag date } {
lappend ans -text-day2 $d
}
if {[dict exists $obj m]} {
lappend ans -text-mon1 [lindex $MonthNames [expr [dict get $obj m] -1]]
lappend ans -text-mon2 [lindex $MonthNames [expr [dict get $obj m] -1]]
lappend ans -text-mon3 [lindex $MonthNames [expr [dict get $obj m] -1]]
set mm [dict get $obj m]
set mm [string trimleft $m 0]
lappend ans -text-mon1 [lindex $MonthNames [expr $mm -1]]
lappend ans -text-mon2 [lindex $MonthNames [expr $mm -1]]
lappend ans -text-mon3 [lindex $MonthNames [expr $mm -1]]
} else {
lappend ans -text-mon1 {every month}
lappend ans -text-mon2 {every month}
@@ -2751,7 +2753,8 @@ proc ReadTaggedOptions { tag date } {
lappend ans -text-ordinal Last
# Adjust month down and possibly year?
if {[dict exists $obj m]} {
set idx [expr [dict get $obj m] -1]
set mm [string trimleft [dict get $obj m] 0]
set idx [expr $mm -1]
if {$idx <= 0} {
set idx 12
}
@@ -2797,15 +2800,18 @@ proc ReadTaggedOptions { tag date } {
if {[dict exists $obj until]} {
set u [dict get $obj until]
regexp {^([0-9][0-9][0-9][0-9]).([0-9][0-9]).([0-9][0-9])} $u all yu mu du
# Trim leading zeros, or Tcl complains
set mu [string trimleft $mu 0]
lappend ans -global-expbut 1
lappend ans -text-expday $du
lappend ans -text-expmon [lindex $MonthNames [expr $mu-1]]
lappend ans -text-expyear $yu
} else {
set mm [string trimleft $m 0]
lappend ans -global-expbut 0
lappend ans -text-expday $d
lappend ans -text-expmon [lindex $MonthNames [expr $m-1]]
lappend ans -text-expmon [lindex $MonthNames [expr $mm-1]]
lappend ans -text-expyear $y
}