From 03a3a99450c5afa5eea24b4ce68847beb74e8acc Mon Sep 17 00:00:00 2001
From: Martin Nilsson <mani@lysator.liu.se>
Date: Sun, 13 Jan 2002 15:15:20 +0100
Subject: [PATCH] Handle \r in data files. [bug 2675]
Rev: lib/modules/Calendar.pmod/TZnames.pmod:1.11
Rev: lib/modules/Calendar.pmod/Timezone.pmod:1.24
---
lib/modules/Calendar.pmod/TZnames.pmod | 4 ++--
lib/modules/Calendar.pmod/Timezone.pmod | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/modules/Calendar.pmod/TZnames.pmod b/lib/modules/Calendar.pmod/TZnames.pmod
index b77a3d8bd5..048c53d62e 100644
--- a/lib/modules/Calendar.pmod/TZnames.pmod
+++ b/lib/modules/Calendar.pmod/TZnames.pmod
@@ -31,8 +31,8 @@ static string raw_zone_tab=0;
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;
diff --git a/lib/modules/Calendar.pmod/Timezone.pmod b/lib/modules/Calendar.pmod/Timezone.pmod
index 4672a904a8..3cb8d2263c 100644
--- a/lib/modules/Calendar.pmod/Timezone.pmod
+++ b/lib/modules/Calendar.pmod/Timezone.pmod
@@ -1037,13 +1037,13 @@ class Runtime_timezone_compiler
string get_all_rules()
{
- return
- map(files,
- lambda(string fn)
- {
- return master()->master_read_file(base_path+fn) ||
- (error("Failed to open file %O\n",base_path+fn), "");
- })*"\n";
+ return
+ map(files,
+ lambda(string fn)
+ {
+ return (master()->master_read_file(base_path+fn) ||
+ (error("Failed to open file %O\n",base_path+fn), "")) - "\r";
+ })*"\n";
}
class Dummymodule
--
GitLab