cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrote _tiffReadProc(), _tiffWriteProc(), and _tiffSeekProc().

Browse Source
This commit is contained in:
Bob Friesenhahn 2007-06-28 22:21:25 +00:00
parent 1a19f4c9ae
commit e04978578e
1 changed files with 20 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
libtiff/tif_unix.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_unix.c,v 1.17 2007-06-28 13:21:55 dron Exp $ */ /* $Id: tif_unix.c,v 1.18 2007-06-28 22:21:25 bfriesen Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -37,6 +37,8 @@
# include <sys/types.h> # include <sys/types.h>
#endif #endif
#include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -59,69 +61,37 @@
static tmsize_t static tmsize_t
_tiffReadProc(thandle_t fd, void* buf, tmsize_t size) _tiffReadProc(thandle_t fd, void* buf, tmsize_t size)
{ {
/* tmsize_t is 64bit on 64bit systems, but the standard library read size_t size_io = (size_t) size;
* takes signed 32bit sizes, so we loop through the data in suitable if ((tmsize_t) size_io != size)
* 32bit sized chunks */
uint8* ma;
uint64 mb;
size_t n;
ssize_t o;
tmsize_t p;
ma=(uint8*)buf;
mb=size;
p=0;
while (mb>0)
{ {
n=SSIZE_MAX; errno=EINVAL;
if ((uint64)n>mb) return (tmsize_t) -1;
n=(size_t)mb;
o=read((int)fd,(void*)ma,n);
if (o<0)
return(0);
ma+=o;
mb-=o;
p+=o;
if ((size_t)o!=n)
break;
} }
return(p); return ((tmsize_t) read((int) fd, buf, size_io));
} }
static tmsize_t static tmsize_t
_tiffWriteProc(thandle_t fd, void* buf, tmsize_t size) _tiffWriteProc(thandle_t fd, void* buf, tmsize_t size)
{ {
/* tmsize_t is 64bit on 64bit systems, but the standard library write size_t size_io = (size_t) size;
* takes signed 32bit sizes, so we loop through the data in suitable if ((tmsize_t) size_io != size)
* 32bit sized chunks */
uint8* ma;
uint64 mb;
size_t n;
ssize_t o;
tmsize_t p;
ma=(uint8*)buf;
mb=size;
p=0;
while (mb>0)
{ {
n=SSIZE_MAX; errno=EINVAL;
if ((uint64)n>mb) return (tmsize_t) -1;
n=(size_t)mb;
o=write((int)fd,(void*)ma,n);
if (o<0)
return(0);
ma+=o;
mb-=o;
p+=o;
if ((size_t)o!=n)
break;
} }
return(p); return ((tmsize_t) write((int) fd, buf, size_io));
} }
static uint64 static uint64
_tiffSeekProc(thandle_t fd, uint64 off, int whence) _tiffSeekProc(thandle_t fd, uint64 off, int whence)
{ {
return((uint64)lseek((int)fd,(off_t)off,whence)); off_t off_io = (off_t) off;
if ((uint64) off_io != off)
{
errno=EINVAL;
return (uint64) -1; /* this is really gross */
}
return((uint64)lseek((int)fd,off_io,whence));
} }
static int static int