* cygwin.din (fstat64): New symbol.
(ftruncate64): Ditto. (lseek64): Ditto. (lstat64): Ditto. (mmap64): Ditto. (seekdir64): Ditto. (stat64): Ditto. (telldir64): Ditto. (truncate64): Ditto. * dir.cc (telldir64): New function. (telldir): Call telldir64(). (seekdir64): New function. (seekdir): Call seekdir64(). * fhandler.h: Redefine all methods using __off32_t to use __off64_t. * fhandler.cc: Use __off64_t and struct __stat64 throughout. * fhandler_clipboard.cc: Ditto. * fhandler_disk_file.cc: Ditto. * fhandler_dsp.cc: Ditto. * fhandler_floppy.cc: Ditto. * fhandler_mem.cc: Ditto. * fhandler_random.cc: Ditto. * fhandler_socket.cc: Ditto. * fhandler_tape.cc: Ditto. * fhandler_zero.cc: Ditto. * pipe.cc: Ditto. * glob.c: Ditto, call lstat64 and stat64 in Cygwin. * mmap.cc: Use __off64_t throughout. (mmap64): New function. * sec_acl.cc (acl_worker): Use struct __stat64, call stat64 and lstat64. * syscalls.cc (lseek64): New function. (stat64_to_stat32): Ditto. (fstat64): Ditto. (stat64): Ditto. (lstat64): Ditto. (ftruncate64): Ditto. (truncate64): Ditto. (_fstat): Call fstat64. (_stat): Call stat64. (cygwin_lstat): Rename to avoid declaration problem. Call lstat64. (stat_worker): Use struct __stat64. (access): Ditto. (ftruncate): Call ftruncate64. (truncate): Call truncate64. * wincap.cc: Set flag has_64bit_file_access appropriately. * wincap.h: Add flag has_64bit_file_access. * winsup.h (ILLEGAL_SEEK): Define as __off64_t. (stat_dev): Declare using struct __stat64. (stat_worker): Ditto. * include/cygwin/stat.h (struct __stat32): Define if compiling Cygwin. (struct __stat64): Ditto. (struct stat): Revert definition with explicitly sized datatypes. Eliminate sized field names. * include/cygwin/types.h (blksize_t): New type. (__blkcnt32_t): Ditto. (__blkcnt64_t): Ditto. (blkcnt_t): Ditto.
This commit is contained in:
@@ -77,16 +77,16 @@ fhandler_dev_floppy::close (void)
|
||||
return fhandler_dev_raw::close ();
|
||||
}
|
||||
|
||||
__off32_t
|
||||
fhandler_dev_floppy::lseek (__off32_t offset, int whence)
|
||||
__off64_t
|
||||
fhandler_dev_floppy::lseek (__off64_t offset, int whence)
|
||||
{
|
||||
int ret;
|
||||
char buf[512];
|
||||
long long drive_size = 0;
|
||||
long long lloffset = offset;
|
||||
long long current_position;
|
||||
__off32_t sector_aligned_offset;
|
||||
__off32_t bytes_left;
|
||||
__off64_t drive_size = 0;
|
||||
__off64_t lloffset = offset;
|
||||
__off64_t current_position;
|
||||
__off64_t sector_aligned_offset;
|
||||
__off64_t bytes_left;
|
||||
DWORD low;
|
||||
LONG high = 0;
|
||||
|
||||
@@ -117,11 +117,11 @@ fhandler_dev_floppy::lseek (__off32_t offset, int whence)
|
||||
debug_printf ("partition info: %ld (%ld)",
|
||||
pi.StartingOffset.LowPart,
|
||||
pi.PartitionLength.LowPart);
|
||||
drive_size = (long long) pi.PartitionLength.QuadPart;
|
||||
drive_size = pi.PartitionLength.QuadPart;
|
||||
}
|
||||
else
|
||||
{
|
||||
drive_size = (long long) di.Cylinders.QuadPart * di.TracksPerCylinder *
|
||||
drive_size = di.Cylinders.QuadPart * di.TracksPerCylinder *
|
||||
di.SectorsPerTrack * di.BytesPerSector;
|
||||
}
|
||||
debug_printf ("drive size: %ld", drive_size);
|
||||
@@ -140,7 +140,7 @@ fhandler_dev_floppy::lseek (__off32_t offset, int whence)
|
||||
__seterrno ();
|
||||
return -1;
|
||||
}
|
||||
current_position = (long long) low + ((long long) high << 32);
|
||||
current_position = low + ((__off64_t) high << 32);
|
||||
if (is_writing)
|
||||
current_position += devbufend - devbufstart;
|
||||
else
|
||||
@@ -156,18 +156,10 @@ fhandler_dev_floppy::lseek (__off32_t offset, int whence)
|
||||
set_errno (EINVAL);
|
||||
return -1;
|
||||
}
|
||||
high = lloffset >> 32;
|
||||
low = lloffset & 0xffffffff;
|
||||
if (high || (__off32_t) low < 0)
|
||||
{
|
||||
set_errno (EFBIG);
|
||||
return -1;
|
||||
}
|
||||
offset = (__off32_t) low;
|
||||
|
||||
/* FIXME: sector can possibly be not 512 bytes long */
|
||||
sector_aligned_offset = (offset / 512) * 512;
|
||||
bytes_left = offset - sector_aligned_offset;
|
||||
sector_aligned_offset = (lloffset / 512) * 512;
|
||||
bytes_left = lloffset - sector_aligned_offset;
|
||||
|
||||
if (whence == SEEK_SET)
|
||||
{
|
||||
@@ -177,8 +169,10 @@ fhandler_dev_floppy::lseek (__off32_t offset, int whence)
|
||||
return ret;
|
||||
devbufstart = devbufend = 0;
|
||||
|
||||
if (SetFilePointer (get_handle (), sector_aligned_offset, NULL, FILE_BEGIN)
|
||||
== INVALID_SET_FILE_POINTER)
|
||||
low = sector_aligned_offset & 0xffffffff;
|
||||
high = sector_aligned_offset >> 32;
|
||||
if (SetFilePointer (get_handle (), low, &high, FILE_BEGIN)
|
||||
== INVALID_SET_FILE_POINTER && GetLastError ())
|
||||
{
|
||||
__seterrno ();
|
||||
return -1;
|
||||
|
Reference in New Issue
Block a user