From 4e91635e4a7089b6288f295320cfa11b31f39dbc Mon Sep 17 00:00:00 2001 From: Phillip Susi Date: Sat, 17 Jun 2000 22:04:08 +0000 Subject: [PATCH] Fixed several erronious checks to detect things such as eof on directories too, not just files svn path=/trunk/; revision=1192 --- reactos/drivers/fs/vfat/rw.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/reactos/drivers/fs/vfat/rw.c b/reactos/drivers/fs/vfat/rw.c index 80e79d471f3..c9418eb6654 100644 --- a/reactos/drivers/fs/vfat/rw.c +++ b/reactos/drivers/fs/vfat/rw.c @@ -1,4 +1,4 @@ -/* $Id: rw.c,v 1.5 2000/04/07 02:24:03 dwelch Exp $ +/* $Id: rw.c,v 1.6 2000/06/17 22:04:08 phreak Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -55,13 +55,11 @@ NTSTATUS FsdReadFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, FirstCluster=CurrentCluster; DPRINT("DeviceExt->BytesPerCluster %x\n",DeviceExt->BytesPerCluster); - if (ReadOffset >= Fcb->entry.FileSize - && !(Fcb->entry.Attrib & FILE_ATTRIBUTE_DIRECTORY)) + if (ReadOffset >= Fcb->entry.FileSize) { return(STATUS_END_OF_FILE); } - if ((ReadOffset + Length) > Fcb->entry.FileSize - && !(Fcb->entry.Attrib & FILE_ATTRIBUTE_DIRECTORY)) + if ((ReadOffset + Length) > Fcb->entry.FileSize) { Length = Fcb->entry.FileSize - ReadOffset; } @@ -353,8 +351,7 @@ NTSTATUS FsdWriteFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, &Fcb->entry.UpdateTime); Fcb->entry.AccessDate = Fcb->entry.UpdateDate; - if (Fcb->entry.FileSize < WriteOffset+Length - && !(Fcb->entry.Attrib & FILE_ATTRIBUTE_DIRECTORY)) + if (Fcb->entry.FileSize < WriteOffset+Length) { Fcb->entry.FileSize = WriteOffset+Length; /*