summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjocuri%softhome.net <>2004-06-22 17:05:49 +0200
committerjocuri%softhome.net <>2004-06-22 17:05:49 +0200
commitb551925ac49548a80cc1f0bf94cb9cc991e09868 (patch)
treee8bf80800ec880e9e0bba38a6ba5582e40d0e6db
parentec22b11474b927e80c0917692d57fbf95cfedb81 (diff)
downloadbugzilla-b551925ac49548a80cc1f0bf94cb9cc991e09868.tar.gz
bugzilla-b551925ac49548a80cc1f0bf94cb9cc991e09868.tar.xz
Patch for bug 225359: Drawing dependency graphs should work on Win32; patch by Byron Jones (glob) <bugzilla@glob.com.au>; r=jouni; a=justdave.
-rwxr-xr-xshowdependencygraph.cgi13
1 files changed, 10 insertions, 3 deletions
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index e0bd376d5..b11562e1e 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -226,14 +226,19 @@ if ($webdotbase =~ /^https?:/) {
# First, generate the png image file from the .dot source
- my $dotfh;
my ($pngfh, $pngfilename) = File::Temp::tempfile("XXXXXXXXXX",
SUFFIX => '.png',
DIR => $webdotdir);
- open (DOT, '-|') or exec ($webdotbase, "-Tpng", $filename);
+ binmode $pngfh;
+ open(DOT, "$webdotbase -Tpng $filename|");
+ binmode DOT;
print $pngfh $_ while <DOT>;
close DOT;
close $pngfh;
+
+ # On Windows $pngfilename will contain \ instead of /
+ $pngfilename =~ s|\\|/|g if $^O eq 'MSWin32';
+
$vars->{'image_url'} = $pngfilename;
# Then, generate a imagemap datafile that contains the corner data
@@ -243,7 +248,9 @@ if ($webdotbase =~ /^https?:/) {
my ($mapfh, $mapfilename) = File::Temp::tempfile("XXXXXXXXXX",
SUFFIX => '.map',
DIR => $webdotdir);
- open (DOT, '-|') or exec ($webdotbase, "-Tismap", $filename);
+ binmode $mapfh;
+ open(DOT, "$webdotbase -Tismap $filename|");
+ binmode DOT;
print $mapfh $_ while <DOT>;
close DOT;
close $mapfh;