epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge from 3.16 branch

Browse Source
This commit is contained in:
Ralph Lange
2017-10-20 16:55:36 +02:00
parent 85712c5825 d5a3df506c
commit 077ff94f9f
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure/CONFIG_SITE_ENV
View File

@@ -27,8 +27,9 @@
# Time service:
# EPICS_TIMEZONE
# Local timezone info for vxWorks and RTEMS. The format is
# <name>::<minutesWest>:<start daylight>:<end daylight>
# where the start and end are mmddhh - that is month,day,hour
# <name>::<minutesWest>:<startDST>:<endDST>
# where <name> is only used by strftime() for %Z conversions,
# and <startDST> and <endDST> are mmddhh - that is month,day,hour
# e.g. for ANL in 2018: EPICS_TIMEZONE=CUS::360:031102:110402
# The future dates below assume the rules don't get changed;
# see http://www.timeanddate.com/time/dst/2018.html to check.

14
src/tools/EPICS/Readfile.pm
View File

@@ -79,13 +79,13 @@ sub splitPath {
return @path;
}
my $RXstr = qr/ " (?: [^"] | \\" )* "/ox;
my $RXnam = qr/[a-zA-Z0-9_\-:.[\]<>;]+/o;
my $string = qr/ ( $RXnam | $RXstr ) /ox;
my $RXstr = qr/ " (?: [^"] | \\" )* "/x;
my $RXnam = qr/ [a-zA-Z0-9_\-:.[\]<>;]+ /x;
my $string = qr/ ( $RXnam | $RXstr ) /x;
sub unquote {
my ($s) = @_;
$s =~ s/^"(.*)"$/$1/o;
$s =~ s/^"(.*)"$/$1/;
return $s;
}
@@ -147,17 +147,17 @@ sub Readfile {
my @input = split /\n/, $input;
my @output;
foreach (@input) {
if (m/^ \s* include \s+ $string /ox) {
if (m/^ \s* include \s+ $string /x) {
$arg = unquote($1);
print " include $arg\n" if $debug;
push @output, "##! include \"$arg\"";
push @output, Readfile($arg, $macros, $Rpath);
} elsif (m/^ \s* addpath \s+ $string /ox) {
} elsif (m/^ \s* addpath \s+ $string /x) {
$arg = unquote($1);
print " addpath $arg\n" if $debug;
push @output, "##! addpath \"$arg\"";
push @{$Rpath}, splitPath($arg);
} elsif (m/^ \s* path \s+ $string /ox) {
} elsif (m/^ \s* path \s+ $string /x) {
$arg = unquote($1);
print " path $arg\n" if $debug;
push @output, "##! path \"$arg\"";