← Back to branch summary

~ubuntu-branches/ubuntu/trusty/krusader/trusty

« back to all changes in this revision

Viewing changes to iso/libisofs/isofs.c

  • Committer: Bazaar Package Importer
  • Author(s): Roderick B. Greening
  • Date: 2009-01-30 12:46:14 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20090130124614-xoq7xpzcr0jck19y
Tags: 2.0~svn6194-0ubuntu1
* New svn snapshot to commit 6194
  - Additional fixes (see: http://krusader.svn.sourceforge.net/viewvc/krusader/trunk/krusader_kde4/?view=log)

Show diffs side-by-side

added added

removed removed

Lines of Context:
iso/libisofs/isofs.c
21
21
#include <string.h>
22
22
 
23
23
#include "isofs.h"
 
24
#include "iso_fs.h"
24
25
 
25
26
/**************************************************************/
26
27
 
122
123
        boot->defentry=NULL;
123
124
}
124
125
 
125
 
int BootImageSize(int media,int len) {
126
 
        int ret;
 
126
long long BootImageSize(int media,unsigned int len) {
 
127
        long long ret;
127
128
 
128
129
        switch(media & 0xf) {
129
130
                case 0:
158
159
        return entry;
159
160
}
160
161
 
161
 
int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata) {
 
162
int ReadBootTable(readfunc *read,unsigned int sector, boot_head *head, void *udata) {
162
163
 
163
164
        char buf[2048], *c, *be;
164
165
        int i,end=0;
221
222
/**
222
223
 * Creates the linked list of the volume descriptors
223
224
 */
224
 
iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata) {
 
225
iso_vol_desc *ReadISO9660(readfunc *read,unsigned int sector,void *udata) {
225
226
                                
226
227
        int i;
227
228
        struct iso_volume_descriptor buf;
408
409
                                }
409
410
                                if ( (c[0] & 0x08) == 0x08 || (c[1] && rrentry->sl && 
410
411
                                         strlen(rrentry->sl)>1) ) {
411
 
                                        if (str_append(&rrentry->sl,(char *)"/")) {
 
412
                                        if (str_append(&rrentry->sl,(char *) DIR_SEPARATOR )) {
412
413
                                                FreeRR(rrentry); return -ENOMEM;
413
414
                                        }
414
415
                                }
577
578
iconv_t iconv_d;
578
579
int fd;
579
580
 
580
 
int readf(char *buf, int start, int len,void *udata) {
 
581
int readf(char *buf, unsigned int start, unsigned int len,void *udata) {
581
582
        int ret;
582
583
        
583
 
        if ((ret=lseek(fd, start << 11, SEEK_SET))<0) return ret;
584
 
        ret=read(fd, buf, len << 11);
 
584
        if ((ret=lseek64(fd, (long long)start << (long long)11, SEEK_SET))<0) return ret;
 
585
        ret=read(fd, buf, len << 11u);
585
586
        if (ret<0) return ret;
586
 
        return (ret >> 11);
 
587
        return (ret >> 11u);
587
588
}
588
589
 
589
590
void dumpchars(char *c,int len) {