X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=b709d93fed1edf91332a66f756b3db6bae7ef813;hp=2b64bc6be9ee8390b2ed8280ec61d6d5d686352b;hb=5e008044bbb82598c2ae8ddd7bab78c955b6d2b0;hpb=35251e467a7817c6b991d88797891b4b1c191d5f

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 2b64bc6..b709d93 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -30,13 +30,6 @@
 #define YAFFSFS_RW_SHIFT (13)
 #define YAFFSFS_RW_SIZE  (1<<YAFFSFS_RW_SHIFT)
 
-
-const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.35 2010-02-25 22:38:03 charles Exp $";
-
-/* configurationList is the list of devices that are supported */
-static yaffsfs_DeviceConfiguration *yaffsfs_configurationList;
-
-
 /* Some forward references */
 static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path, int symDepth);
 static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj);
@@ -69,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)
@@ -115,31 +110,46 @@ yaffs_Object *yaffsfs_GetHandleObject(int handle)
 }
 
 /*
- * yaffsfs_GetInodeIdForObject
- * Grab an inode entry when opening a new inode.
+ * yaffsfs_FindInodeIdForObject
+ * Find the inode entry for an object, if it exists.
  */
 
-static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj)
+static int yaffsfs_FindInodeIdForObject(yaffs_Object *obj)
 {
 	int i;
 	int ret = -1;
-	yaffsfs_Inode *in = NULL;
 	
 	if(obj)
 		obj = yaffs_GetEquivalentObject(obj);
 
-	/* Look for it. If we can't find it then make one */
+	/* Look for it in open inode table*/
 	for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){
 		if(yaffsfs_inode[i].iObj == obj)
 			ret = i;
 	}
+	return ret;
+}
+
+/*
+ * yaffsfs_GetInodeIdForObject
+ * Grab an inode entry when opening a new inode.
+ */
+static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj)
+{
+	int i;
+	int ret;
+	yaffsfs_Inode *in = NULL;
+	
+	if(obj)
+		obj = yaffs_GetEquivalentObject(obj);
+
+        ret = yaffsfs_FindInodeIdForObject(obj);
 
 	for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){
 		if(!yaffsfs_inode[i].iObj)
 			ret = i;
 	}
-	
-	
+
 	if(ret>=0){
 		in = &yaffsfs_inode[ret];
 		if(!in->iObj)
@@ -152,6 +162,17 @@ static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj)
 	return ret;
 }
 
+
+static int yaffsfs_CountHandles(yaffs_Object *obj)
+{
+	int i = yaffsfs_FindInodeIdForObject(obj);
+
+	if(i >= 0)
+		return yaffsfs_inode[i].count;
+	else
+		return 0;
+}
+
 static void yaffsfs_ReleaseInode(yaffsfs_Inode *in)
 {
 	yaffs_Object *obj;
@@ -253,7 +274,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)
@@ -264,6 +285,10 @@ int yaffsfs_IsPathDivider(YCHAR ch)
 	return 0;
 }
 
+
+
+YLIST_HEAD(yaffsfs_deviceList);
+
 /*
  * yaffsfs_FindDevice
  * yaffsfs_FindRoot
@@ -273,10 +298,11 @@ int yaffsfs_IsPathDivider(YCHAR ch)
  */
 static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
 {
-	yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList;
+	struct ylist_head *cfg;
 	const YCHAR *leftOver;
 	const YCHAR *p;
 	yaffs_Device *retval = NULL;
+	yaffs_Device *dev = NULL;
 	int thisMatchLength;
 	int longestMatch = -1;
 	int matching;
@@ -286,9 +312,10 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
 	 * 1) Actually matches a prefix (ie /a amd /abc will not match
 	 * 2) Matches the longest.
 	 */
-	while(cfg && cfg->prefix && cfg->dev){
+	ylist_for_each(cfg, &yaffsfs_deviceList){
+		dev = ylist_entry(cfg, yaffs_Device, devList);
 		leftOver = path;
-		p = cfg->prefix;
+		p = dev->param.name;
 		thisMatchLength = 0;
 		matching = 1;
 
@@ -319,16 +346,23 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
 		/* Skip over any /s in leftOver */
 		while(yaffsfs_IsPathDivider(*leftOver))
 	              leftOver++;
-		
 
-		if( matching && (thisMatchLength > longestMatch)){
-			/* Matched prefix */
+		// Skip over any /s in p
+		while(yaffsfs_IsPathDivider(*p))
+	              p++;
+
+		// p should now be at the end of the string (ie. fully matched)
+		if(*p)
+			matching = 0;
+
+		if( matching && (thisMatchLength > longestMatch))
+		{
+			// Matched prefix
 			*restOfPath = (YCHAR *)leftOver;
-			retval = cfg->dev;
+			retval = dev;
 			longestMatch = thisMatchLength;
 		}
 
-		cfg++;
 	}
 	return retval;
 }
@@ -567,12 +601,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
@@ -1091,7 +1134,7 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
 		obj = yaffs_GetEquivalentObject(obj);
 
 	if(obj && buf){
-	    	buf->st_dev = (int)obj->myDev->context;
+	    	buf->st_dev = (int)obj->myDev->osContext;
 	    	buf->st_ino = obj->objectId;
 	    	buf->st_mode = obj->yst_mode & ~S_IFMT; /* clear out file type bits */
 
@@ -1180,7 +1223,7 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf)
 	return retVal;
 }
 
-
+#ifndef CONFIG_YAFFS_WINCE
 /* xattrib functions */
 
 
@@ -1434,6 +1477,7 @@ int yaffs_fremovexattr(int fd, const char *name)
 
 	return retVal;
 }
+#endif
 
 #ifdef CONFIG_YAFFS_WINCE
 int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime)
@@ -1621,7 +1665,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)
@@ -1644,6 +1691,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;
@@ -1654,6 +1709,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){
@@ -1695,7 +1753,7 @@ int yaffs_sync(const YCHAR *path)
                         
                         yaffs_FlushEntireDeviceCache(dev);
                         yaffs_CheckpointSave(dev);
-                        
+                        retVal = 0;
                         
                 } else
                         /* todo error - not mounted. */
@@ -1846,7 +1904,7 @@ int yaffs_inodecount(const YCHAR *path)
 	yaffsfs_Lock();
 	dev = yaffsfs_FindDevice(path,&dummy);
 	if(dev  && dev->isMounted) {
-	   int nObjects = dev->nObjectsCreated - dev->nFreeObjects;
+	   int nObjects = dev->nObjects;
 	   if(nObjects > dev->nHardLinks)
 		retVal = nObjects - dev->nHardLinks;
 	}
@@ -1859,26 +1917,23 @@ int yaffs_inodecount(const YCHAR *path)
 }
 
 
-
-void yaffs_initialise(yaffsfs_DeviceConfiguration *cfgList)
+void yaffs_AddDevice(yaffs_Device *dev)
 {
+	dev->isMounted = 0;
+	dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback;
 
-	yaffsfs_DeviceConfiguration *cfg;
-
-	yaffsfs_configurationList = cfgList;
+	if(!dev->devList.next)
+		YINIT_LIST_HEAD(&dev->devList);
 
-	yaffsfs_InitHandles();
-
-	cfg = yaffsfs_configurationList;
+	ylist_add(&dev->devList,&yaffsfs_deviceList);
+}
 
-	while(cfg && cfg->prefix && cfg->dev){
-		cfg->dev->isMounted = 0;
-		cfg->dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback;
-		cfg++;
-	}
+void yaffs_RemoveDevice(yaffs_Device *dev)
+{
+	ylist_del_init(&dev->devList);
+}
 
 
-}
 
 
 /* Directory search stuff. */
@@ -2194,6 +2249,23 @@ int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
 	return -1;
 }
 
+
+
+/*
+ * yaffs_n_handles()
+ * Returns number of handles attached to the object
+ */
+int yaffs_n_handles(const YCHAR *path)
+{
+	yaffs_Object *obj;
+
+	obj = yaffsfs_FindObject(NULL,path,0);
+	if(obj)
+		obj = yaffs_GetEquivalentObject(obj);
+
+	return yaffsfs_CountHandles(obj);
+}
+
 int yaffs_DumpDevStruct(const YCHAR *path)
 {
 #if 0