Attachment #21589 for bug #34754

Lines 595-603 Link Here

(-)PDL-2.4.0.orig/Basic/Core/Dev.pm (-3 / +1 lines)
595		595
596	my $HIDE = ($^O =~ /MSWin/) \|\| !$hide ? '' : '>/dev/null 2>&1';	596	my $HIDE = ($^O =~ /MSWin/) \|\| !$hide ? '' : '>/dev/null 2>&1';
597	my $td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp';	597	my $td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp';
598	my $tempd = defined $ENV{TEMP} ? $ENV{TEMP} :	598	my $tempd = defined $ENV{TMP} ? $ENV{TMP} : &$cdir($fs->rootdir,$td);
599	defined $ENV{TMP} ? $ENV{TMP} :
600	&$cdir($fs->rootdir,$td);
601		599
602	my ($tc,$te) = map {&$cfile($tempd,"testfile$_")} ('.c','');	600	my ($tc,$te) = map {&$cfile($tempd,"testfile$_")} ('.c','');
603	open FILE,">$tc" or die "couldn't open testfile `$tc' for writing";	601	open FILE,">$tc" or die "couldn't open testfile `$tc' for writing";

Lines 102-110 Link Here

(-)PDL-2.4.0.orig/Basic/Math/Makefile.PL (-3 / +1 lines)
102	$dir = $fs->canonpath(cwd);	102	$dir = $fs->canonpath(cwd);
103	$dir = cdir $dir, $mdir unless $dir =~ /$mmdir$/;	103	$dir = cdir $dir, $mdir unless $dir =~ /$mmdir$/;
104	$td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp';	104	$td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp';
105	$tempd = defined $ENV{TEMP} ? $ENV{TEMP} :	105	$tempd = defined $ENV{TMP} ? $ENV{TMP} : cdir($fs->rootdir,$td);
106	defined $ENV{TMP} ? $ENV{TMP} :
107	cdir($fs->rootdir,$td);
108		106
109	foreach (@sfuncs) {	107	foreach (@sfuncs) {
110	$source{$_} = 'system' if is_sys_func( "$_();", $libs );	108	$source{$_} = 'system' if is_sys_func( "$_();", $libs );

Lines 89-97 Link Here

(-)PDL-2.4.0.orig/Basic/MatrixOps/Makefile.PL (-3 / +1 lines)
89	$dir = $fs->canonpath(cwd);	89	$dir = $fs->canonpath(cwd);
90	$dir = cdir $dir, $mdir unless $dir =~ /$mmdir$/;	90	$dir = cdir $dir, $mdir unless $dir =~ /$mmdir$/;
91	$td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp';	91	$td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp';
92	$tempd = defined $ENV{TEMP} ? $ENV{TEMP} :	92	$tempd = defined $ENV{TMP} ? $ENV{TMP} : cdir($fs->rootdir,$td);
93	defined $ENV{TMP} ? $ENV{TMP} :
94	cdir($fs->rootdir,$td);
95		93
96	foreach (@sfuncs) {	94	foreach (@sfuncs) {
97	$source{$_} = 'system' if is_sys_func( "$_();", $libs );	95	$source{$_} = 'system' if is_sys_func( "$_();", $libs );

Lines 536-543 Link Here

(-)PDL-2.4.0.orig/Graphics/TriD/TriD/VRML.pm (-3 / +2 lines)
536	$this->{'Type'} = $types{$mime};	536	$this->{'Type'} = $types{$mime};
537	&{$this->{'Type'}->{'setup'}} if defined $this->{'Type'}->{'setup'};	537	&{$this->{'Type'}->{'setup'}} if defined $this->{'Type'}->{'setup'};
538	$this->{'Binding'} = 'local';	538	$this->{'Binding'} = 'local';
539	$this->{'Filestem'} = ($ENV{'TMP'} \|\| $ENV{'TEMP'} \|\| '/tmp') .	539	$this->{'Filestem'} = ($ENV{'TMP'} \|\| '/tmp') . "/tridim_$urlnum"; $urlnum++;
540	"/tridim_$urlnum"; $urlnum++;
541	return $this;	540	return $this;
542	}	541	}
543		542
Lines 565-571 Link Here
565	};	564	};
566		565
567	# set up the default parameters for VRML	566	# set up the default parameters for VRML
568	my $tmpdir = $ENV{'TMP'} \|\| $ENV{'TEMP'} \|\| '/tmp';	567	my $tmpdir = $ENV{'TMP'} \|\| '/tmp';
569	my $tmpname = "$tmpdir/tridvrml_$$.wrl";	568	my $tmpname = "$tmpdir/tridvrml_$$.wrl";
570	my $para = $PDL::Graphics::TriD::Settings =	569	my $para = $PDL::Graphics::TriD::Settings =
571	PDL::Graphics::TriD::VRML::Parameter->new() ;	570	PDL::Graphics::TriD::VRML::Parameter->new() ;

Lines 767-773 Link Here

(-)PDL-2.4.0.orig/IO/Pnm/Pic.pm (-1 lines)
767	# are there already VMS or Windows NT/95 users ?	767	# are there already VMS or Windows NT/95 users ?
768	my $tmpdir = '/tmp';	768	my $tmpdir = '/tmp';
769	$tmpdir = $ENV{"TMP"} if defined $ENV{"TMP"};	769	$tmpdir = $ENV{"TMP"} if defined $ENV{"TMP"};
770	$tmpdir = $ENV{"TEMP"} if defined $ENV{"TEMP"};
771	$tmpdir =~ s\|/$\|\|; # chop off a trailing '/'	770	$tmpdir =~ s\|/$\|\|; # chop off a trailing '/'
772	barf "can't locate a temp dir" unless -d $tmpdir;	771	barf "can't locate a temp dir" unless -d $tmpdir;
773	return $tmpdir;	772	return $tmpdir;

Lines 73-79 Link Here

(-)PDL-2.4.0.orig/IO/Pnm/pnm.pd (-1 / +1 lines)
73	# in the future an os indep. way	73	# in the future an os indep. way
74	# are there already VMS or Windows NT/95 users ?	74	# are there already VMS or Windows NT/95 users ?
75	my $tmpdir = '/tmp';	75	my $tmpdir = '/tmp';
76	for ('TMP','TEMP','TMPDIR') {	76	for ('TMP','TMPDIR') {
77	$tmpdir = $ENV{$_} if defined $ENV{$_};	77	$tmpdir = $ENV{$_} if defined $ENV{$_};
78	}	78	}
79	$tmpdir =~ s\|/$\|\|; # chop off a trailing '/'	79	$tmpdir =~ s\|/$\|\|; # chop off a trailing '/'

Lines 30-38 Link Here

(-)PDL-2.4.0.orig/t/misc.t (-3 / +1 lines)
30	sub cdir { return $fs->catdir(@_)}	30	sub cdir { return $fs->catdir(@_)}
31	sub cfile { return $fs->catfile(@_)}	31	sub cfile { return $fs->catfile(@_)}
32	$td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp';	32	$td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp';
33	$tempd = defined $ENV{TEMP} ? $ENV{TEMP} :	33	$tempd = defined $ENV{TMP} ? $ENV{TMP} : cdir($fs->rootdir,$td);
34	defined $ENV{TMP} ? $ENV{TMP} :
35	cdir($fs->rootdir,$td);
36	$file = cfile $tempd, "iotest$$";	34	$file = cfile $tempd, "iotest$$";
37		35
38	############# Test rcols with filename and pattern #############	36	############# Test rcols with filename and pattern #############

Return to bug 34754