61 lines
2.4 KiB
Plaintext
61 lines
2.4 KiB
Plaintext
Allow the quote mark delimiter also for those #include directives chased with
|
|
"h2ph -a". Debian bug #479762.
|
|
|
|
Also add the directory prefix of the current file when the quote syntax is
|
|
used; 'require' will only look in @INC, not the current directory.
|
|
|
|
Upstream change 33835.
|
|
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
|
|
index 0bfea18..a3ff285 100644
|
|
--- a/utils/h2ph.PL
|
|
+++ b/utils/h2ph.PL
|
|
@@ -85,7 +85,7 @@ sub reindent($) {
|
|
}
|
|
|
|
my ($t, $tab, %curargs, $new, $eval_index, $dir, $name, $args, $outfile);
|
|
-my ($incl, $incl_type, $next);
|
|
+my ($incl, $incl_type, $incl_quote, $next);
|
|
while (defined (my $file = next_file())) {
|
|
if (-l $file and -d $file) {
|
|
link_if_possible($file) if ($opt_l);
|
|
@@ -186,9 +186,10 @@ while (defined (my $file = next_file())) {
|
|
print OUT $t,"unless(defined(\&$name)) {\n sub $name () {\t",$new,";}\n}\n";
|
|
}
|
|
}
|
|
- } elsif (/^(include|import|include_next)\s*[<\"](.*)[>\"]/) {
|
|
+ } elsif (/^(include|import|include_next)\s*([<\"])(.*)[>\"]/) {
|
|
$incl_type = $1;
|
|
- $incl = $2;
|
|
+ $incl_quote = $2;
|
|
+ $incl = $3;
|
|
if (($incl_type eq 'include_next') ||
|
|
($opt_e && exists($bad_file{$incl}))) {
|
|
$incl =~ s/\.h$/.ph/;
|
|
@@ -221,6 +222,10 @@ while (defined (my $file = next_file())) {
|
|
"warn(\$\@) if \$\@;\n");
|
|
} else {
|
|
$incl =~ s/\.h$/.ph/;
|
|
+ # copy the prefix in the quote syntax (#include "x.h") case
|
|
+ if ($incl !~ m|/| && $incl_quote eq q{"} && $file =~ m|^(.*)/|) {
|
|
+ $incl = "$1/$incl";
|
|
+ }
|
|
print OUT $t,"require '$incl';\n";
|
|
}
|
|
} elsif (/^ifdef\s+(\w+)/) {
|
|
@@ -724,8 +729,13 @@ sub queue_includes_from
|
|
$line .= <HEADER>;
|
|
}
|
|
|
|
- if ($line =~ /^#\s*include\s+<(.*?)>/) {
|
|
- push(@ARGV, $1) unless $Is_converted{$1};
|
|
+ if ($line =~ /^#\s*include\s+([<"])(.*?)[>"]/) {
|
|
+ my ($delimiter, $new_file) = ($1, $2);
|
|
+ # copy the prefix in the quote syntax (#include "x.h") case
|
|
+ if ($delimiter eq q{"} && $file =~ m|^(.*)/|) {
|
|
+ $new_file = "$1/$new_file";
|
|
+ }
|
|
+ push(@ARGV, $new_file) unless $Is_converted{$new_file};
|
|
}
|
|
}
|
|
close HEADER;
|