X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=577cb361762c8db2e1c9d7c69d65c6b2446eb079;hp=c7937b075a04aa7f22410cef1139084446caf0bc;hb=99a86b3ba4859f536d08c70f6797385fc94f2653;hpb=991af291b91f76e80019a9d81ddd6c5885aec195

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index c7937b0..577cb36 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -756,6 +756,13 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 			if( writeRequested && !(obj->yst_mode & S_IWRITE))
 				openDenied = 1;
 
+			if( !errorReported && writeRequested && 
+				obj->my_dev->read_only){
+				openDenied = 1;
+				yaffsfs_SetError(-EROFS);
+				errorReported = 1;
+			}
+
 			if(openDenied && !errorReported ) {
 				/* Error if the file exists but permissions are refused. */
 				yaffsfs_SetError(-EACCES);
@@ -820,7 +827,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 		if(!obj && dir && !errorReported && (oflag & O_CREAT)) {
 			/* Let's see if we can create this file if it does not exist. */
 			if(dir->my_dev->read_only){
-				yaffsfs_SetError(-EINVAL);
+				yaffsfs_SetError(-EROFS);
 				errorReported = 1;
 			} else
 				obj = yaffs_create_file(dir,name,mode,0,0);
@@ -881,19 +888,23 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
 int yaffs_Dofsync(int fd,int datasync)
 {
 	yaffsfs_Handle *h = NULL;
-	int retVal = 0;
+	int retVal = -1;
 
 	yaffsfs_Lock();
 
 	h = yaffsfs_GetHandlePointer(fd);
 
-	if(h && h->useCount > 0)
-		/* flush the file */
-		yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync);
-	else {
-		/* bad handle */
+	if(!h || h->useCount < 1)
 		yaffsfs_SetError(-EBADF);
-		retVal = -1;
+	else {
+		struct yaffs_obj * obj;
+		obj = yaffsfs_inode[h->inodeId].iObj;
+		if(obj->my_dev->read_only)
+			yaffsfs_SetError(-EROFS);
+		else {		
+			yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync);
+			retVal = 0;
+		}
 	}
 
 	yaffsfs_Unlock();
@@ -1081,9 +1092,12 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite,
 		/* bad handle */
 		yaffsfs_SetError(-EBADF);
 		totalWritten = -1;
-	} else if( h && obj && (!h->writing || obj->my_dev->read_only)){
+	} else if(!h->writing){
 		yaffsfs_SetError(-EINVAL);
 		totalWritten=-1;
+	} else if(obj->my_dev->read_only){
+		yaffsfs_SetError(-EROFS);
+		totalWritten=-1;
 	} else {
 		if(h->append)
 			startPos = yaffs_get_obj_length(obj);
@@ -1191,6 +1205,8 @@ int yaffs_truncate(const YCHAR *path,off_t new_size)
 		yaffsfs_SetError(-ELOOP);
 	else if(!dir || !obj)
 		yaffsfs_SetError(-ENOENT);
+	else if(obj->my_dev->read_only)
+		yaffsfs_SetError(-EROFS);
 	else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
 		yaffsfs_SetError(-EISDIR);
 	else if(obj->my_dev->read_only)
@@ -1219,7 +1235,7 @@ int yaffs_ftruncate(int fd, off_t new_size)
 		/* bad handle */
 		yaffsfs_SetError(-EBADF);
 	else if(obj->my_dev->read_only)
-		yaffsfs_SetError(-EACCES);
+		yaffsfs_SetError(-EROFS);
 	else if( new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE)
 		yaffsfs_SetError(-EINVAL);
 	else
@@ -1303,7 +1319,7 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
 	else if(!obj)
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->my_dev->read_only)
-		yaffsfs_SetError(-EINVAL);
+		yaffsfs_SetError(-EROFS);
 	else if(!isDirectory && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
 		yaffsfs_SetError(-EISDIR);
 	else if(isDirectory && obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
@@ -2194,15 +2210,17 @@ int yaffs_sync(const YCHAR *path)
         yaffsfs_Lock();
         dev = yaffsfs_FindDevice(path,&dummy);
         if(dev){
-                if(dev->is_mounted){
+                if(!dev->is_mounted)
+			yaffsfs_SetError(-EINVAL);
+		else if(dev->read_only)
+			yaffsfs_SetError(-EROFS);
+		else {
                         
                         yaffs_flush_whole_cache(dev);
                         yaffs_checkpoint_save(dev);
                         retVal = 0;
                         
-                } else
-                        yaffsfs_SetError(-EINVAL);
-                        
+                }      
         }else
                 yaffsfs_SetError(-ENODEV);
 
@@ -2708,7 +2726,7 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
 	else if(!obj_dir || !lnk_dir || !obj)
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->my_dev->read_only)
-		yaffsfs_SetError(-EINVAL);
+		yaffsfs_SetError(-EROFS);
 	else if(lnk)
 		yaffsfs_SetError(-EEXIST);
 	else if(lnk_dir->my_dev != obj->my_dev)