pike.git/ lib/ modules/ Calendar.pmod/ TZnames.pmod

2002-01-13

2002-01-13 14:15:20 by Martin Nilsson <mani@lysator.liu.se>

• 03a3a99450c5afa5eea24b4ce68847beb74e8acc (5 lines) (+3/-2) ^{[ Show | Annotate ]}
  Branch: 7.9

Handle \r in data files. [bug 2675 (#2675)]

Rev: lib/modules/Calendar.pmod/TZnames.pmod:1.11
Rev: lib/modules/Calendar.pmod/Timezone.pmod:1.24

31:   string _zone_tab()   {    return raw_zone_tab || -  (raw_zone_tab = master()->master_read_file( -  combine_path(__FILE__,"..","tzdata/zone.tab"))); +  (raw_zone_tab = ( master()->master_read_file( +  combine_path(__FILE__,"..","tzdata/zone.tab")) - "\r"));   }      static array(array(string)) parsed_zone_tab=0;