diff options
Diffstat (limited to 'kioslave/iso/libisofs')
-rw-r--r-- | kioslave/iso/libisofs/isofs.c | 12 | ||||
-rw-r--r-- | kioslave/iso/libisofs/isofs.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c index ab13d9eb9..e59945026 100644 --- a/kioslave/iso/libisofs/isofs.c +++ b/kioslave/iso/libisofs/isofs.c @@ -122,8 +122,8 @@ void FreeBootTable(boot_head *boot) { boot->defentry=NULL; } -int BootImageSize(int media,int len) { - int ret; +int BootImageSize(int media,long len) { + long long ret; switch(media & 0xf) { case 0: @@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) { return entry; } -int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata) { +int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) { char buf[2048], *c, *be; int i,end=0; @@ -221,7 +221,7 @@ err: /** * Creates the linked list of the volume descriptors */ -iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata) { +iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) { int i; struct iso_volume_descriptor buf; @@ -577,10 +577,10 @@ int level=0,joliet=0,dirs,files; iconv_t iconv_d; int fd; -int readf(char *buf, int start, int len,void *udata) { +int readf(char *buf, long start, long len,void *udata) { int ret; - if ((ret=lseek(fd, start << 11, SEEK_SET))<0) return ret; + if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret; ret=read(fd, buf, len << 11); if (ret<0) return ret; return (ret >> 11); diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h index 52190e673..b8971a4c6 100644 --- a/kioslave/iso/libisofs/isofs.h +++ b/kioslave/iso/libisofs/isofs.h @@ -50,7 +50,7 @@ typedef struct _rr_entry { int re; /* relocated */ char z_algo[2]; /* zizofs algorithm */ char z_params[2]; /* zizofs parameters */ - int z_size; /* zizofs real_size */ + long z_size; /* zizofs real_size */ } rr_entry; typedef struct _iso_vol_desc { @@ -78,7 +78,7 @@ typedef struct _boot_head { /** * this callback function needs to read 'len' sectors from 'start' into 'buf' */ -typedef int readfunc(char *buf,int start, int len,void *); +typedef int readfunc(char *buf,long start, long len,void *); /** * ProcessDir uses this callback @@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs); * If the function fails, returns NULL * Don't forget to call FreeISO9660 after using the volume descriptor list! */ -iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata); +iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata); /** * Frees the linked list of volume descriptors @@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd); /** * Returns the size of the boot image (in 512 byte sectors) */ -int BootImageSize(int media,int len); +int BootImageSize(int media,long len); /** * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable, @@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot); /** * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable! */ -int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata); +int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata); #ifdef __cplusplus } //extern "C" |