diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-09-27 11:15:51 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-09-27 11:15:51 +0000 |
| commit | 97c10e7733209f2a73e1d4b214196ecbe19275b2 (patch) | |
| tree | 9c663f214f113177c2f0d24a48b39a7b27be2bf4 /lib/File | |
| parent | fd58862f51cd3f5fdbd6e93549721f19252499bc (diff) | |
| download | perl-97c10e7733209f2a73e1d4b214196ecbe19275b2.tar.gz | |
Integrate changes #12241 and #12242 from macperl:
Remove unneeded disabling of umask() calls
Note (get|set)sockopt are available.
p4raw-link: @12241 on //depot/maint-5.6/macperl: 113e0f7d7f04be69474441a252121e8e322dfb7e
p4raw-id: //depot/perl@12245
p4raw-integrated: from //depot/maint-5.6/macperl@12244 'copy in'
lib/File/Temp.pm (@11813..) pod/perlport.pod (@12214..)
Diffstat (limited to 'lib/File')
| -rw-r--r-- | lib/File/Temp.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/File/Temp.pm b/lib/File/Temp.pm index 3248a960f0..97b2895f12 100644 --- a/lib/File/Temp.pm +++ b/lib/File/Temp.pm @@ -452,10 +452,10 @@ sub _gettemp { local $^F = 2; # Store callers umask - my $umask = umask() unless ($^O eq 'MacOS'); + my $umask = umask(); # Set a known umask - umask(066) unless ($^O eq 'MacOS'); + umask(066); # Attempt to open the file my $open_success = undef; @@ -472,14 +472,14 @@ sub _gettemp { if ( $open_success ) { # Reset umask - umask($umask) unless ($^O eq 'MacOS'); + umask($umask); # Opened successfully - return file handle and name return ($fh, $path); } else { # Reset umask - umask($umask) unless ($^O eq 'MacOS'); + umask($umask); # Error opening file - abort with error # if the reason was anything but EEXIST @@ -494,22 +494,22 @@ sub _gettemp { } elsif ($options{"mkdir"}) { # Store callers umask - my $umask = umask() unless ($^O eq 'MacOS'); + my $umask = umask(); # Set a known umask - umask(066) unless ($^O eq 'MacOS'); + umask(066); # Open the temp directory if (mkdir( $path, 0700)) { # created okay # Reset umask - umask($umask) unless ($^O eq 'MacOS'); + umask($umask); return undef, $path; } else { # Reset umask - umask($umask) unless ($^O eq 'MacOS'); + umask($umask); # Abort with error if the reason for failure was anything # except EEXIST |