X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=db51171405c6c881a8cd0d91b0e84a2c1fa4e8b1;hb=9b9fd2ac90990fed4990feec36ab1ec55fc78926;hp=b93f29534962ac909489f81cfcfd91a17532fdd1;hpb=ca0474074161712816ce1ead07dcc83c4e2ebe29;p=yaffs2.git

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index b93f295..db51171 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -62,21 +62,23 @@ typedef struct{
 
 static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES];
 static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES];
+static int yaffsfs_handlesInitialised;
 
 /*
  * yaffsfs_InitHandle
  * Inilitalise handle management on start-up.
  */
 
-static int yaffsfs_InitHandles(void)
+static void yaffsfs_InitHandles(void)
 {
 	int i;
+	if(yaffsfs_handlesInitialised)
+                return;
+
 	memset(yaffsfs_inode,0,sizeof(yaffsfs_inode));
 	memset(yaffsfs_handle,0,sizeof(yaffsfs_handle));
 	for(i = 0; i < YAFFSFS_N_HANDLES; i++)
 		yaffsfs_handle[i].inodeId = -1;
-
-	return 0;
 }
 
 yaffsfs_Handle *yaffsfs_GetHandlePointer(int h)
@@ -246,7 +248,7 @@ int yaffsfs_Match(YCHAR a, YCHAR b)
 
 int yaffsfs_IsPathDivider(YCHAR ch)
 {
-	YCHAR *str = YAFFS_PATH_DIVIDERS;
+	const YCHAR *str = YAFFS_PATH_DIVIDERS;
 
 	while(*str){
 		if(*str == ch)
@@ -1637,7 +1639,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)
@@ -1660,6 +1665,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;
@@ -1670,6 +1683,9 @@ int yaffs_mount2(const YCHAR *path,int readOnly)
 	T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path));
 
 	yaffsfs_Lock();
+
+	yaffsfs_InitHandles();
+
 	dev = yaffsfs_FindDevice(path,&dummy);
 	if(dev){
 		if(!dev->isMounted){