X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=9ac08abb15be867cd69da6e466cd54523cfbf57a;hp=fc68b969e017c9a82af5b66452f95cfdfae87408;hb=213dc0b42fbe8652e454bfdbf9f5c41c6eb4974c;hpb=f792554ed6d0b514dfb040097033417d8e41f420

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index fc68b96..9ac08ab 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -573,12 +573,21 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
 		if(obj)
 			obj = yaffs_GetEquivalentObject(obj);
 
-		if(obj && obj->variantType != YAFFS_OBJECT_TYPE_FILE)
+		if(obj &&
+			obj->variantType != YAFFS_OBJECT_TYPE_FILE &&
+			obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
 			obj = NULL;
 
 		if(obj){
 
-			/* The file already exists */
+			/* The file already exists or it might be a directory */
+
+			/* If it is a directory then we can't open it as a file */
+			if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+				openDenied = 1;
+				yaffsfs_SetError(-EISDIR);
+				errorReported = 1;
+			}
 
 			/* Open should fail if O_CREAT and O_EXCL are specified since
 			 * the file exists
@@ -1628,7 +1637,10 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
 
 	yaffsfs_Lock();
 	parent = yaffsfs_FindDirectory(NULL,path,&name,0);
-	if(parent && parent->myDev->readOnly){
+	if(parent && yaffs_strnlen(name,5) == 0){
+		/* Trying to make the root itself */
+		yaffsfs_SetError(-EEXIST);
+	} else if(parent && parent->myDev->readOnly){
 		yaffsfs_SetError(-EINVAL);
 	} else {
 		if(parent)
@@ -1651,6 +1663,14 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
 	return retVal;
 }
 
+void * yaffs_getdev(const YCHAR *path)
+{
+	yaffs_Device *dev=NULL;
+	YCHAR *dummy;
+	dev = yaffsfs_FindDevice(path,&dummy);
+	return (void *)dev;
+}
+
 int yaffs_mount2(const YCHAR *path,int readOnly)
 {
 	int retVal=-1;
@@ -1702,7 +1722,7 @@ int yaffs_sync(const YCHAR *path)
                         
                         yaffs_FlushEntireDeviceCache(dev);
                         yaffs_CheckpointSave(dev);
-                        
+                        retVal = 0;
                         
                 } else
                         /* todo error - not mounted. */