Changeset 1130 for Whitix

Timestamp:

10/14/08 19:36:08 (1 month ago)

Author:

mwhitworth

Message:

Add to DoSeekFile (more error checking).

Files:

• Whitix/branches/keobject/fs/vfs/file.c (modified) (12 diffs)

Whitix/branches/keobject/fs/vfs/file.c

@@ -142 +142 @@
                         return -EIO;
                 }
-
+                
                 buff=BlockRead(vNode->superBlock->sDevice, res);
 
@@ -157 +157 @@
                 file->position+=readSize;
 
-                BlockFree(buff);
+//              BlockFree(buff);
         }
 
@@ -321 +321 @@
                 err=file->fileOps->read(file,buffer,size);
                 VfsFileAccessed(file->vNode);
+                
                 return err;
         }
@@ -365 +366 @@
 int DoSeekFile(struct File* file,int distance,int whence)
 {
+        int temp=-1;
+        
         if (file->vNode->mode & VFS_ATTR_DIR)
                 return -EISDIR;
@@ -374 +377 @@
                 {
                         case 0: /* SEEK_SET */
-                                file->position=distance;
+                                temp=distance;
                                 break;
 
                         case 1: /* SEEK_CUR */
-                                file->position+=distance;
+                                temp = file->position+distance;
                                 break;
 
                         case 2: /* SEEK_END */
-                                file->position=file->vNode->size-distance;
+                                if (!file->vNode)
+                                        return -EINVAL;
+                                temp =file->vNode->size - distance;
                                 break;
+                                
+                        default:
+                                KePrint("Invalid, %d\n", whence);
+                                return -EINVAL;
                 }
         }
+        
+        if (temp < 0)
+                return -EINVAL;
+                
+        if (temp != file->position)
+                file->position = temp; /* May want to adjust readahead at this point */
 
         return file->position;
@@ -540 +555 @@
         struct File file;
 
+        /* FIXME: Should we allocate a fd this early? */
         fd=VfsGetFreeFd(current);
 
@@ -572 +588 @@
  */
 
-int SysRead(int fd,BYTE* buffer,DWORD amount)
+int SysRead(int fd, BYTE* buffer, DWORD amount)
 {
         struct File* file=FileGet(fd);
@@ -598 +614 @@
                 return -EFAULT;
 
+//      KePrint("SysWrite(%d, %#X, %#X)\n", fd, data, amount);
+
         return DoWriteFile(file,data,amount);
 }
@@ -721 +739 @@
 }
 
+/* TODO: Create sync function for file operations. */
 int SysFileSync(int fd)
 {
@@ -729 +748 @@
 
         VNodeWrite(file->vNode);
+        
         return BlockSyncDevice(file->vNode->superBlock->sDevice);
 }
@@ -753 +773 @@
                 err=file->vNode->vNodeOps->truncate(file->vNode,length);
                 if (!err)
+                {
                         file->vNode->size=length;
+                        
+                        if (file->position > length)
+                                file->position = length;
+                }
         }else
                 err=-ENOTIMPL;
@@ -775 +800 @@
         if (UNLIKELY(!file))
                 return -EBADF;
-
+                
         return DoSeekFile(file,distance,whence);
 }