summaryrefslogtreecommitdiff
path: root/com32/lib/sys/fileread.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-03-06 11:55:57 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-03-06 11:55:57 -0800
commite375515ddc712f1f69ee21337db2a3267caa5d49 (patch)
tree234cecab51fe9bfb341289ce0d0620543f77f047 /com32/lib/sys/fileread.c
parentead9bc6ff2fdfffc2f0974bb8de02f54a7671922 (diff)
downloadsyslinux-e375515ddc712f1f69ee21337db2a3267caa5d49.tar.gz
Add 32-bit versions of open file/close file
Add 32-bit API calls for open file and close file. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/lib/sys/fileread.c')
-rw-r--r--com32/lib/sys/fileread.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/com32/lib/sys/fileread.c b/com32/lib/sys/fileread.c
index cfd49557..aab99c80 100644
--- a/com32/lib/sys/fileread.c
+++ b/com32/lib/sys/fileread.c
@@ -42,8 +42,8 @@ int __file_get_block(struct file_info *fp)
{
ssize_t bytes_read;
- bytes_read = __com32.cs_pm->read_file(&fp->i.filedes, fp->i.buf,
- MAXBLOCK >> fp->i.blocklg2);
+ bytes_read = __com32.cs_pm->read_file(&fp->i.fd.handle, fp->i.buf,
+ MAXBLOCK >> fp->i.fd.blocklg2);
if (!bytes_read) {
errno = EIO;
return -1;
@@ -62,13 +62,13 @@ ssize_t __file_read(struct file_info * fp, void *buf, size_t count)
while (count) {
if (fp->i.nbytes == 0) {
- if (fp->i.offset >= fp->i.length || !fp->i.filedes)
+ if (fp->i.offset >= fp->i.fd.size || !fp->i.fd.handle)
return n; /* As good as it gets... */
if (count > MAXBLOCK) {
/* Large transfer: copy directly, without buffering */
- ncopy = __com32.cs_pm->read_file(&fp->i.filedes, bufp,
- count >> fp->i.blocklg2);
+ ncopy = __com32.cs_pm->read_file(&fp->i.fd.handle, bufp,
+ count >> fp->i.fd.blocklg2);
if (!ncopy) {
errno = EIO;
return n ? n : -1;