From d4c8aae018c9305b6d02fbe20cb66a84910b3bcf Mon Sep 17 00:00:00 2001 From: Geert-Jan Giezeman Date: Fri, 24 Dec 1999 09:49:12 +0000 Subject: [PATCH] *** empty log message *** --- Packages/Scripts/scripts/cgal_conditional_include | 6 +++--- Packages/Scripts/scripts/cgal_conditional_include_remove | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Packages/Scripts/scripts/cgal_conditional_include b/Packages/Scripts/scripts/cgal_conditional_include index cb12694e58a..875262d2ed6 100755 --- a/Packages/Scripts/scripts/cgal_conditional_include +++ b/Packages/Scripts/scripts/cgal_conditional_include @@ -1,4 +1,4 @@ -#!/local/bin/perl -w +#!/sw/bin/perl -w # alter the path above to the result of `which perl` on your system # usage: cgal_conditional_include file1 ... @@ -35,11 +35,11 @@ $tmpfilename = "CondIncl$$"; FILE: foreach $filename (@ARGV) { - if (!open(infile, $filename)) { + if (!open("infile", $filename)) { print STDERR "Could not open ${filename} for reading\n$!\n"; next FILE; } - open(tmpfile, ">$tmpfilename") + open("tmpfile", ">$tmpfilename") || die "Could not open temp file for writing\n$!\n"; $last = ''; Line: diff --git a/Packages/Scripts/scripts/cgal_conditional_include_remove b/Packages/Scripts/scripts/cgal_conditional_include_remove index 0d0e2721342..8c608f37f1e 100755 --- a/Packages/Scripts/scripts/cgal_conditional_include_remove +++ b/Packages/Scripts/scripts/cgal_conditional_include_remove @@ -51,7 +51,7 @@ foreach $filename (@ARGV) { $_ = ; my $include_file; if ( !(($include_file) = - m|^[\s]*#[\s]*include[\s]*<(.*)(?:\.h)?>[\s]*|)) { + m|^[\s]*#[\s]*include[\s]*<(.*?)(?:\.h)?>[\s]*|)) { warn "'#include <...>' missing in line ", $.-$skipped," ($filename)\n"; print TMPFILE $protect_line; @@ -108,7 +108,7 @@ foreach $filename (@ARGV) { $_ = ; my $include_file; if ( !(($include_file) = - m|^[\s]*#[\s]*include[\s]*[\s]*|)) { + m|^[\s]*#[\s]*include[\s]*[\s]*|)) { print TMPFILE $protect_line; redo; }