oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix roken-h-process.pl

Browse Source
This commit is contained in:
James Le Cuirot
2014-02-01 21:19:38 +00:00
parent cc1faff15f
commit 97f1e2efb5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -38,6 +38,7 @@ EXTRA_DIST = \
autogen.sh \ autogen.sh \
krb5.conf \ krb5.conf \
cf/make-proto.pl \ cf/make-proto.pl \
cf/roken-h-process.pl \
cf/install-catman.sh \ cf/install-catman.sh \
cf/ChangeLog \ cf/ChangeLog \
cf/c-function.m4 \ cf/c-function.m4 \

8
cf/roken-h-process.pl
View File

@@ -145,15 +145,15 @@ sub parse_if
if (m/^\s*$/) { if (m/^\s*$/) {
print "end $_\n" if ($debug); print "end $_\n" if ($debug);
return 1; return 1;
} elsif (m/^\(([^&]+)\&\&(.*)\)\s*\|\|\s*\(([^&]+)\&\&(.*)\)$/) {
print "($1 and $2) or ($3 and $4)\n" if ($debug);
return ((parse_if($1) and parse_if($2)) or (parse_if($3) and parse_if($4)));
} elsif (m/^([^&]+)\&\&(.*)$/) { } elsif (m/^([^&]+)\&\&(.*)$/) {
print "$1 and $2\n" if ($debug); print "$1 and $2\n" if ($debug);
return parse_if($1) and parse_if($2); return parse_if($1) and parse_if($2);
} elsif (m/^\(([^&]+)\&\&(.*)$/) {
print "$1 and $2\n" if ($debug);
return parse_if($1) and parse_if($2);
} elsif (m/^([^\|]+)\|\|(.*)$/) { } elsif (m/^([^\|]+)\|\|(.*)$/) {
print "$1 or $2\n" if ($debug); print "$1 or $2\n" if ($debug);
return parse_if($1) or parse_if($2); return (parse_if($1) or parse_if($2));
} elsif (m/^\s*(\!)?\s*defined\((\w+)\)/) { } elsif (m/^\s*(\!)?\s*defined\((\w+)\)/) {
($neg, $var) = ($1, $2); ($neg, $var) = ($1, $2);
print "def: ${neg}-defined(${var})\n" if ($debug); print "def: ${neg}-defined(${var})\n" if ($debug);