Rev 4921 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4921 | Rev 6536 | ||
|---|---|---|---|
| Line 10... | Line 10... | ||
| 10 | * Modifications to this software may be copyrighted by their authors |
10 | * Modifications to this software may be copyrighted by their authors |
| 11 | * and need not follow the licensing terms described here, provided that |
11 | * and need not follow the licensing terms described here, provided that |
| 12 | * the new terms are clearly indicated on the first page of each file where |
12 | * the new terms are clearly indicated on the first page of each file where |
| 13 | * they apply. |
13 | * they apply. |
| 14 | */ |
14 | */ |
| 15 | #include |
- | |
| 16 | #include |
15 | #include |
| 17 | #include |
- | |
| 18 | #include |
16 | #include |
| 19 | #include |
- | |
| 20 | #include |
- | |
| 21 | #include "glue.h" |
- | |
| 22 | #include "io.h" |
17 | #include "io.h" |
| Line 23... | Line 18... | ||
| 23 | 18 | ||
| 24 | #undef erro |
19 | #undef erro |
| Line 61... | Line 56... | ||
| 61 | return( -1 ); |
56 | return( -1 ); |
| 62 | } |
57 | } |
| Line 63... | Line 58... | ||
| 63 | 58 | ||
| 64 | if( iomode_flags & _BINARY ) /* if binary mode */ |
59 | if( iomode_flags & _BINARY ) /* if binary mode */ |
| 65 | { |
60 | { |
| 66 | err = read_file(ioh->name, buffer, ioh->offset, cnt, &amount_read); |
61 | err = ioh->read(ioh->name, buffer, ioh->offset, cnt, &amount_read); |
| 67 | ioh->offset+= amount_read; |
62 | ioh->offset+= amount_read; |
| Line 68... | Line 63... | ||
| 68 | total_len = amount_read; |
63 | total_len = amount_read; |
| 69 | 64 | ||
| Line 75... | Line 70... | ||
| 75 | { |
70 | { |
| 76 | total_len = 0; |
71 | total_len = 0; |
| 77 | read_len = cnt; |
72 | read_len = cnt; |
| 78 | do |
73 | do |
| 79 | { |
74 | { |
| 80 | err=read_file(ioh->name,buffer, ioh->offset, cnt, &amount_read); |
75 | err=ioh->read(ioh->name,buffer, ioh->offset, cnt, &amount_read); |
| 81 | ioh->offset+=amount_read; |
76 | ioh->offset+=amount_read; |
| Line 82... | Line 77... | ||
| 82 | 77 | ||
| 83 | if( amount_read == 0 ) |
78 | if( amount_read == 0 ) |