-z FH broken with Borland build [was: Smoke [5.9.3] 25867 FAIL(XF) MSWin32 WinXP/.Net SP2 (x86/2 cpu)] #8179
Comments
From @pmqs[Forgot to CC this to perlbug] I've tracked the failure in ext/Compress/Zlib/t/22merge.t to an issue with Consider this code use IO::File; my $out_file = "abd.txt"; my $fh = new IO::File ">$out_file" $fh = new IO::File "<$out_file" my @a = stat $fh; With the Borland C compiler 5.5.1 I get exists and with an MS compiler (using the same snapshot) I get the expected exists Looks like even though stat could detect that the filehandle referenced an Looking at the test harness, I see that t/op/stat.t tests -z with a Paul
|
From @pmqsLooks like Borland 5.5.1 has a 64-bit stat function but not a corresponding The enclosed patch hopefully sorts this out and provides a few tests to Paul
|
From @pmqszero.patch# This is a patch for perl-current.orig to update it to perl-current
#
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'patch' program with this file as input.
#
#### End of Preamble ####
#### Patch data follows ####
diff -c 'perl-current.orig/t/op/stat.t' 'perl-current/t/op/stat.t'
Index: ./t/op/stat.t
*** ./t/op/stat.t Thu Aug 11 09:02:11 2005
--- ./t/op/stat.t Tue Nov 1 14:17:02 2005
***************
*** 9,15 ****
use Config;
use File::Spec;
! plan tests => 82;
my $Perl = which_perl();
--- 9,15 ----
use Config;
use File::Spec;
! plan tests => 86;
my $Perl = which_perl();
***************
*** 128,133 ****
--- 128,135 ----
# truncate and touch $tmpfile.
open(F, ">$tmpfile") || DIE("Can't open temp test file: $!");
+ ok(-z \*F, '-z on empty filehandle');
+ ok(! -s \*F, ' and -s');
close F;
ok(-z $tmpfile, '-z on empty file');
***************
*** 137,142 ****
--- 139,149 ----
print F "hi\n";
close F;
+ open(F, "<$tmpfile") || DIE("Can't open temp test file: $!");
+ ok(!-z *F, '-z on empty filehandle');
+ ok( -s *F, ' and -s');
+ close F;
+
ok(! -z $tmpfile, '-z on non-empty file');
ok(-s $tmpfile, ' and -s');
diff -c 'perl-current.orig/win32/win32.c' 'perl-current/win32/win32.c'
Index: ./win32/win32.c
*** ./win32/win32.c Fri Aug 12 16:53:20 2005
--- ./win32/win32.c Tue Nov 1 14:21:16 2005
***************
*** 2734,2742 ****
* for write operations, probably because it is opened for reading.
* --Vadim Konovalov
*/
- int rc = fstat(fd,sbufptr);
BY_HANDLE_FILE_INFORMATION bhfi;
if (GetFileInformationByHandle((HANDLE)_get_osfhandle(fd), &bhfi)) {
sbufptr->st_mode &= 0xFE00;
if (bhfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
sbufptr->st_mode |= (S_IREAD + (S_IREAD >> 3) + (S_IREAD >> 6));
--- 2734,2764 ----
* for write operations, probably because it is opened for reading.
* --Vadim Konovalov
*/
BY_HANDLE_FILE_INFORMATION bhfi;
+ #if defined(WIN64) || defined(USE_LARGE_FILES)
+ /* Borland 5.5.1 has a 64-bit stat, but only a 32-bit fstat */
+ struct stat tmp;
+ int rc = fstat(fd,&tmp);
+
+ sbufptr->st_dev = tmp.st_dev;
+ sbufptr->st_ino = tmp.st_ino;
+ sbufptr->st_mode = tmp.st_mode;
+ sbufptr->st_nlink = tmp.st_nlink;
+ sbufptr->st_uid = tmp.st_uid;
+ sbufptr->st_gid = tmp.st_gid;
+ sbufptr->st_rdev = tmp.st_rdev;
+ sbufptr->st_size = tmp.st_size;
+ sbufptr->st_atime = tmp.st_atime;
+ sbufptr->st_mtime = tmp.st_mtime;
+ sbufptr->st_ctime = tmp.st_ctime;
+ #else
+ int rc = fstat(fd,sbufptr);
+ #endif
+
if (GetFileInformationByHandle((HANDLE)_get_osfhandle(fd), &bhfi)) {
+ #if defined(WIN64) || defined(USE_LARGE_FILES)
+ sbufptr->st_size = (bhfi.nFileSizeHigh << 32) + bhfi.nFileSizeLow ;
+ #endif
sbufptr->st_mode &= 0xFE00;
if (bhfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
sbufptr->st_mode |= (S_IREAD + (S_IREAD >> 3) + (S_IREAD >> 6));
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Tue Nov 1 14:21:35 2005
# Generated by : makepatch 2.00
# Recurse directories : Yes
# v 'patchlevel.h' 4744 1126373890 33060
# p 't/op/stat.t' 13196 1130854622 0100555
# p 'win32/win32.c' 124368 1130854876 0100444
#### End of ApplyPatch data ####
#### End of Patch kit [created: Tue Nov 1 14:21:35 2005] ####
#### Checksum: 124 4002 31545 ####
|
From @steve-m-hayPaul Marquess wrote:
Excellent. I'll have a closer look tomorrow, but at a quick glance I Btw, Sorry I haven't got back on your other Compress-Zlib change -- http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2005-10/msg00796.html -- I'm still waiting to see the hoped-for white smoke, but my machine Radan Computational Ltd. The information contained in this message and any files transmitted with it are confidential and intended for the addressee(s) only. If you have received this message in error or there are any problems, please notify the sender immediately. The unauthorized use, disclosure, copying or alteration of this message is strictly forbidden. Note that any views or opinions presented in this email are solely those of the author and do not necessarily represent those of Radan Computational Ltd. The recipient(s) of this message should check it and any attached files for viruses: Radan Computational will accept no liability for any damage caused by any virus transmitted by this email. |
|
The RT System itself - Status changed from 'new' to 'open' |
From @pmqsFrom: Steve Hay [mailto:steve.hay@uk.radan.com]
It isn't obvious from the patch, but the code I changed is already wrapped
No problem. I was able to do a before and after test on a win32 box myself, Paul |
From @steve-m-hayPaul Marquess wrote:
Oh yes, I see now. Applied as change #25952. Thanks.
White smoke finally appeared here (if you can see through the base64 http://www.nntp.perl.org/group/perl.daily-build.reports/32783 so all is indeed now well :-) Radan Computational Ltd. The information contained in this message and any files transmitted with it are confidential and intended for the addressee(s) only. If you have received this message in error or there are any problems, please notify the sender immediately. The unauthorized use, disclosure, copying or alteration of this message is strictly forbidden. Note that any views or opinions presented in this email are solely those of the author and do not necessarily represent those of Radan Computational Ltd. The recipient(s) of this message should check it and any attached files for viruses: Radan Computational will accept no liability for any damage caused by any virus transmitted by this email. |
|
@steve-m-hay - Status changed from 'open' to 'resolved' |
Migrated from rt.perl.org#37571 (status was 'resolved')
Searchable as RT37571$
The text was updated successfully, but these errors were encountered: