X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=fffc11eece7b691892c767c5122a04e556374514;hp=014bfc57020478d3b9a647cffae8741068b38616;hb=80f85303d264f804ea288e1995280345804ec01c;hpb=0ed6086affa15e1537da1b16d2ab3af654713a15

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 014bfc5..fffc11e 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -17,7 +17,7 @@
 #include "yportenv.h"
 #include "yaffs_trace.h"
 
-#include <string.h> /* for memset */
+#include "string.h"
 
 #define YAFFSFS_MAX_SYMLINK_DEREFERENCES 5
 
@@ -124,7 +124,7 @@ static void yaffsfs_InitHandles(void)
 
 static yaffsfs_Handle *yaffsfs_HandleToPointer(int h)
 {
-	if(h >= 0 && h <= YAFFSFS_N_HANDLES)
+	if(h >= 0 && h < YAFFSFS_N_HANDLES)
 		return &yaffsfs_handle[h];
 	return NULL;
 }
@@ -380,13 +380,27 @@ static void yaffsfs_BreakDeviceHandles(struct yaffs_dev *dev)
 /*
  *  Stuff to handle names.
  */
+#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
+ 
+static int yaffs_toupper(YCHAR a)
+{
+	if(a >= 'a' && a <= 'z')
+		return (a - 'a') + 'A';
+	else
+		return a;
+}
 
-
+int yaffsfs_Match(YCHAR a, YCHAR b)
+{
+	return (yaffs_toupper(a) == yaffs_toupper(b));
+}
+#else
 int yaffsfs_Match(YCHAR a, YCHAR b)
 {
 	/* case sensitive */
 	return (a == b);
 }
+#endif
 
 int yaffsfs_IsPathDivider(YCHAR ch)
 {
@@ -405,7 +419,7 @@ int yaffsfs_CheckNameLength(const char *name)
 {
 	int retVal = 0;
 
-	int nameLength = strnlen(name,YAFFS_MAX_NAME_LENGTH+1);
+	int nameLength = yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH+1);
 
 	if(nameLength == 0){
 		yaffsfs_SetError(-ENOENT);
@@ -430,7 +444,7 @@ static int yaffsfs_alt_dir_path(const YCHAR *path, YCHAR **ret_path)
 	 * We will use 3 * max name length instead.
 	 */
 	*ret_path = NULL;
-	path_length = strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1);
+	path_length = yaffs_strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1);
 
 	/* If the last character is a path divider, then we need to
 	 * trim it back so that the name look-up works properly.
@@ -443,7 +457,7 @@ static int yaffsfs_alt_dir_path(const YCHAR *path, YCHAR **ret_path)
 		alt_path = kmalloc(path_length + 1, 0);
 		if(!alt_path)
 			return -1;
-		strcpy(alt_path, path);
+		yaffs_strcpy(alt_path, path);
 		for(i = path_length-1;
 			i >= 0 && yaffsfs_IsPathDivider(alt_path[i]);
 			i--)
@@ -650,9 +664,9 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir,
 			/* got to the end of the string */
 			return dir;
 		else{
-			if(strcmp(str,_Y(".")) == 0){
+			if(yaffs_strcmp(str,_Y(".")) == 0){
 				/* Do nothing */
-			} else if(strcmp(str,_Y("..")) == 0) {
+			} else if(yaffs_strcmp(str,_Y("..")) == 0) {
 				dir = dir->parent;
 			} else{
 				dir = yaffs_find_by_name(dir,str);
@@ -743,7 +757,15 @@ int yaffs_dup(int handle)
 
 }
 
+static int yaffsfs_TooManyObjects(struct yaffs_dev *dev)
+{
+	int current_objects = dev->n_obj - dev->n_deleted_files;
 
+	if(dev->param.max_objects && current_objects > dev->param.max_objects)
+		return 1;
+	else
+		return 0;
+}
 
 int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 {
@@ -915,6 +937,9 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 			if(dir->my_dev->read_only){
 				yaffsfs_SetError(-EROFS);
 				errorReported = 1;
+			} else if(yaffsfs_TooManyObjects(dir->my_dev)) {
+				yaffsfs_SetError(-ENFILE);
+				errorReported = 1;
 			} else
 				obj = yaffs_create_file(dir,name,mode,0,0);
 
@@ -1419,7 +1444,7 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
 		yaffsfs_SetError(-ELOOP);
 	else if(!dir)
 		yaffsfs_SetError(-ENOENT);
-	else if(strncmp(name,_Y("."),2) == 0)
+	else if(yaffs_strncmp(name,_Y("."),2) == 0)
 		yaffsfs_SetError(-EINVAL);
 	else if(!obj)
 		yaffsfs_SetError(-ENOENT);
@@ -1507,7 +1532,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 	} else if(oldLoop || newLoop) {
 		yaffsfs_SetError(-ELOOP);
 		rename_allowed = 0;
-	} else if (olddir && oldname && strncmp(oldname, _Y("."),2) == 0){
+	} else if (olddir && oldname && yaffs_strncmp(oldname, _Y("."),2) == 0){
 		yaffsfs_SetError(-EINVAL);
 		rename_allowed = 0;
 	}else if(!olddir || !newdir || !obj) {
@@ -2366,7 +2391,9 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
 		yaffsfs_SetError(-ELOOP);
 	else if(!parent)
 		yaffsfs_SetError(-ENOENT);
-	else if(strnlen(name,5) == 0){
+	else if(yaffsfs_TooManyObjects(parent->my_dev))
+		yaffsfs_SetError(-ENFILE);
+	else if(yaffs_strnlen(name,5) == 0){
 		/* Trying to make the root itself */
 		yaffsfs_SetError(-EEXIST);
 	} else if(parent->my_dev->read_only)
@@ -2719,6 +2746,14 @@ int yaffs_inodecount(const YCHAR *path)
 
 void yaffs_add_device(struct yaffs_dev *dev)
 {
+	struct list_head *cfg;
+	/* First check that the device is not in the list. */
+
+	list_for_each(cfg, &yaffsfs_deviceList){
+		if(dev == list_entry(cfg, struct yaffs_dev, dev_list))
+			return;
+	}
+
 	dev->is_mounted = 0;
 	dev->param.remove_obj_fn = yaffsfs_RemoveObjectCallback;
 
@@ -2864,7 +2899,7 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
 			memset(dsc,0,sizeof(yaffsfs_DirectorySearchContext));
                         dsc->magic = YAFFS_MAGIC;
                         dsc->dirObj = obj;
-                        strncpy(dsc->name,dirname,NAME_MAX);
+                        yaffs_strncpy(dsc->name,dirname,NAME_MAX);
                         INIT_LIST_HEAD(&dsc->others);
 
                         if(!search_contexts.next)
@@ -2895,10 +2930,10 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp)
 			dsc->de.d_dont_use = (unsigned)dsc->nextReturn;
 			dsc->de.d_off = dsc->offset++;
 			yaffs_get_obj_name(dsc->nextReturn,dsc->de.d_name,NAME_MAX);
-			if(strnlen(dsc->de.d_name,NAME_MAX+1) == 0)
+			if(yaffs_strnlen(dsc->de.d_name,NAME_MAX+1) == 0)
 			{
 				/* this should not happen! */
-				strcpy(dsc->de.d_name,_Y("zz"));
+				yaffs_strcpy(dsc->de.d_name,_Y("zz"));
 			}
 			dsc->de.d_reclen = sizeof(struct yaffs_dirent);
 			retVal = &dsc->de;
@@ -2974,8 +3009,10 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
 		yaffsfs_SetError(-ENOTDIR);
 	else if(loop)
 		yaffsfs_SetError(-ELOOP);
-	else if( !parent || strnlen(name,5) < 1)
+	else if( !parent || yaffs_strnlen(name,5) < 1)
 		yaffsfs_SetError(-ENOENT);
+	else if(yaffsfs_TooManyObjects(parent->my_dev))
+		yaffsfs_SetError(-ENFILE);
 	else if(parent->my_dev->read_only)
 		yaffsfs_SetError(-EROFS);
 	else if(parent){
@@ -3022,7 +3059,7 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 	else {
 		YCHAR *alias = obj->variant.symlink_variant.alias;
 		memset(buf,0,bufsiz);
-		strncpy(buf,alias,bufsiz - 1);
+		yaffs_strncpy(buf,alias,bufsiz - 1);
 		retVal = 0;
 	}
 	yaffsfs_Unlock();
@@ -3068,6 +3105,8 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->my_dev->read_only)
 		yaffsfs_SetError(-EROFS);
+	else if(yaffsfs_TooManyObjects(obj->my_dev))
+		yaffsfs_SetError(-ENFILE);
 	else if(lnk)
 		yaffsfs_SetError(-EEXIST);
 	else if(lnk_dir->my_dev != obj->my_dev)