Module Name: src
Committed By: jakllsch
Date: Mon Mar 22 16:57:54 UTC 2010
Modified Files:
src/sys/lib/libsa: cd9660.c
Log Message:
Ensure cd9660_read() gives accurate EOF indication.
Should fix PR/42983.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/lib/libsa/cd9660.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libsa/cd9660.c
diff -u src/sys/lib/libsa/cd9660.c:1.24 src/sys/lib/libsa/cd9660.c:1.25
--- src/sys/lib/libsa/cd9660.c:1.24 Wed Nov 19 12:36:41 2008
+++ src/sys/lib/libsa/cd9660.c Mon Mar 22 16:57:54 2010
@@ -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;
