Correct return value of OpenBSD::MkTemp in scalar context

From Francesco Toscan < f.toscan AT hotmail DOT it >

ok guenther@

2 files changed, 16 insertions, 4 deletions

diff --git a/gnu/usr.bin/perl/cpan/OpenBSD-MkTemp/lib/OpenBSD/MkTemp.pm b/gnu/usr.bin/perl/cpan/OpenBSD-MkTemp/lib/OpenBSD/MkTemp.pm
index d5c8efbe208..20131be15d3 100644
--- a/gnu/usr.bin/perl/cpan/OpenBSD-MkTemp/lib/OpenBSD/MkTemp.pm
+++ b/gnu/usr.bin/perl/cpan/OpenBSD-MkTemp/lib/OpenBSD/MkTemp.pm
@@ -16,16 +16,16 @@ XSLoader::load('OpenBSD::MkTemp', $VERSION);
 sub mkstemp($)
 {
 	my $template = shift;
-	my $fh = mkstemps_real($template, 0);
-	return $fh && ($fh, $template)
+	my $fh = mkstemps_real($template, 0) || return;
+	return wantarray() ? ($fh, $template) : $fh;
 }
 
 sub mkstemps($$)
 {
 	my($template, $suffix) = @_;
 	$template .= $suffix;
-	my $fh = mkstemps_real($template, length($suffix));
-	return $fh && ($fh, $template)
+	my $fh = mkstemps_real($template, length($suffix)) || return;
+	return wantarray() ? ($fh, $template) : $fh;
 }
 
 
diff --git a/gnu/usr.bin/perl/cpan/OpenBSD-MkTemp/t/OpenBSD-MkTemp.t b/gnu/usr.bin/perl/cpan/OpenBSD-MkTemp/t/OpenBSD-MkTemp.t
index c4fa9c35239..143d80d2cec 100644
--- a/gnu/usr.bin/perl/cpan/OpenBSD-MkTemp/t/OpenBSD-MkTemp.t
+++ b/gnu/usr.bin/perl/cpan/OpenBSD-MkTemp/t/OpenBSD-MkTemp.t
@@ -10,6 +10,7 @@ use warnings;
 
 use Test::More;
 use Errno;
+use Scalar::Util qw( openhandle );
 BEGIN { use_ok('OpenBSD::MkTemp') };
 
 #########################
@@ -62,6 +63,17 @@ undef $fh2;
 open(F, ">$file2")		|| die "$0: unable to open $file2: $!";
 cmp_ok(fileno(F), '==', $fileno, "mkstemp file handle ref counting");
 
+subtest "mkstemp in scalar context" => sub {
+    plan tests => 2;
+    ok my $fh = OpenBSD::MkTemp::mkstemp($template);
+    is openhandle($fh), $fh, "mkstemp returns a filehandle in scalar mode";
+};
+
+subtest "mkstemps in scalar context" => sub {
+    plan tests => 2;
+    ok my $fh = OpenBSD::MkTemp::mkstemps($template, ".foo");
+    is openhandle($fh), $fh, "mkstemps returns a filehandle in scalar mode";
+};
 
 #
 # How about some failures?