[src/trunk]: src/sys/lib/libsa Ensure cd9660_read() gives accurate EOF indica...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eb1de1ebe45d
branches:  trunk
changeset: 753299:eb1de1ebe45d
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Mar 22 16:57:54 2010 +0000

description:
Ensure cd9660_read() gives accurate EOF indication.
Should fix PR/42983.

diffstat:

 sys/lib/libsa/cd9660.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r dbee5a5086ed -r eb1de1ebe45d sys/lib/libsa/cd9660.c
--- a/sys/lib/libsa/cd9660.c    Mon Mar 22 16:49:41 2010 +0000
+++ b/sys/lib/libsa/cd9660.c    Mon Mar 22 16:57:54 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660.c,v 1.24 2008/11/19 12:36:41 ad Exp $   */
+/*     $NetBSD: cd9660.c,v 1.25 2010/03/22 16:57:54 jakllsch Exp $     */
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -345,6 +345,8 @@
                        size -= ISO_DEFAULT_BLOCK_SIZE;
                }
        }
+       if(fp->off > fp->size)
+               size += fp->off - fp->size;
        if (resid)
                *resid = size;
        return rc;