X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=fffc11eece7b691892c767c5122a04e556374514;hp=41d37f46601f1939e90ea883ec2002b1e348b3d6;hb=80f85303d264f804ea288e1995280345804ec01c;hpb=ddc0558522ec4a25d3f12f1d0d83c81a6bb7996a diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index 41d37f4..fffc11e 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2010 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -17,7 +17,7 @@ #include "yportenv.h" #include "yaffs_trace.h" -#include /* for memset */ +#include "string.h" #define YAFFSFS_MAX_SYMLINK_DEREFERENCES 5 @@ -31,7 +31,12 @@ #define YAFFSFS_RW_SIZE (1<= YAFFSFS_N_HANDLES) - return NULL; + if(h >= 0 && h < YAFFSFS_N_HANDLES) + return &yaffsfs_handle[h]; + return NULL; +} + +static yaffsfs_FileDes *yaffsfs_HandleToFileDes(int handle) +{ + yaffsfs_Handle *h = yaffsfs_HandleToPointer(handle); + + if(h && h->useCount > 0 && h->fdId >= 0 && h->fdId < YAFFSFS_N_HANDLES) + return &yaffsfs_fd[h->fdId]; - return &yaffsfs_handle[h]; + return NULL; } -yaffsfs_Inode *yaffsfs_GetInodePointer(int handle) +static yaffsfs_Inode *yaffsfs_HandleToInode(int handle) { - yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); + yaffsfs_FileDes *fd = yaffsfs_HandleToFileDes(handle); - if(h && h->useCount > 0 && h->inodeId >= 0 && h->inodeId < YAFFSFS_N_HANDLES) - return &yaffsfs_inode[h->inodeId]; + if(fd && fd->handleCount > 0 && + fd->inodeId >= 0 && fd->inodeId < YAFFSFS_N_HANDLES) + return &yaffsfs_inode[fd->inodeId]; return NULL; } -struct yaffs_obj *yaffsfs_GetHandleObject(int handle) +static struct yaffs_obj *yaffsfs_HandleToObject(int handle) { - yaffsfs_Inode *in = yaffsfs_GetInodePointer(handle); + yaffsfs_Inode *in = yaffsfs_HandleToInode(handle); if(in) return in->iObj; @@ -133,7 +169,7 @@ static int yaffsfs_FindInodeIdForObject(struct yaffs_obj *obj) { int i; int ret = -1; - + if(obj) obj = yaffs_get_equivalent_obj(obj); @@ -154,7 +190,7 @@ static int yaffsfs_GetInodeIdForObject(struct yaffs_obj *obj) int i; int ret; yaffsfs_Inode *in = NULL; - + if(obj) obj = yaffs_get_equivalent_obj(obj); @@ -172,8 +208,8 @@ static int yaffsfs_GetInodeIdForObject(struct yaffs_obj *obj) in->iObj = obj; in->count++; } - - + + return ret; } @@ -191,12 +227,12 @@ static int yaffsfs_CountHandles(struct yaffs_obj *obj) static void yaffsfs_ReleaseInode(yaffsfs_Inode *in) { struct yaffs_obj *obj; - + obj = in->iObj; if(obj->unlinked) yaffs_del_obj(obj); - + obj->my_inode = NULL; in->iObj = NULL; @@ -207,49 +243,75 @@ static void yaffsfs_PutInode(int inodeId) if(inodeId >= 0 && inodeId < YAFFSFS_N_HANDLES){ yaffsfs_Inode *in = & yaffsfs_inode[inodeId]; in->count--; - if(in->count <= 0) + if(in->count <= 0){ yaffsfs_ReleaseInode(in); - } + in->count = 0; + } + } } -/* - * yaffsfs_GetHandle - * Grab a handle (when opening a file) - */ -static int yaffsfs_GetNewHandle(void) +static int yaffsfs_NewHandle(yaffsfs_Handle **hptr) { int i; yaffsfs_Handle *h; for(i = 0; i < YAFFSFS_N_HANDLES; i++){ - h = yaffsfs_GetHandlePointer(i); - if(!h){ - /* todo bug: should never happen */ - } + h = &yaffsfs_handle[i]; if(h->useCount < 1){ memset(h,0,sizeof(yaffsfs_Handle)); - h->inodeId=-1; + h->fdId=-1; h->useCount=1; + if(hptr) + *hptr = h; return i; } } return -1; } +static int yaffsfs_NewHandleAndFileDes(void) +{ + int i; + yaffsfs_FileDes *fd; + yaffsfs_Handle *h = NULL; + int handle = yaffsfs_NewHandle(&h); + + if(handle < 0) + return -1; + + for(i = 0; i < YAFFSFS_N_HANDLES; i++){ + fd = &yaffsfs_fd[i]; + if(fd->handleCount < 1){ + memset(fd,0,sizeof(yaffsfs_FileDes)); + fd->inodeId=-1; + fd->handleCount=1; + h->fdId = i; + return handle; + } + } + + /* Dump the handle because we could not get a fd */ + h->useCount = 0; + return -1; +} + /* * yaffs_get_handle * Increase use of handle when reading/writing a file + * Also gets the file descriptor. */ + static int yaffsfs_GetHandle(int handle) { - yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); + yaffsfs_Handle *h = yaffsfs_HandleToPointer(handle); - if(h && h->useCount > 0){ + if(h && h->useCount > 0){ h->useCount++; + return 0; } - return 0; + return -1; } /* @@ -257,35 +319,88 @@ static int yaffsfs_GetHandle(int handle) * Let go of a handle when closing a file or aborting an open or * ending a read or write. */ + +static int yaffsfs_PutFileDes(int fdId) +{ + yaffsfs_FileDes *fd; + + if(fdId >= 0 && fdId < YAFFSFS_N_HANDLES){ + fd = &yaffsfs_fd[fdId]; + fd->handleCount--; + if(fd->handleCount < 1){ + if(fd->inodeId >= 0){ + yaffsfs_PutInode(fd->inodeId); + fd->inodeId = -1; + } + } + } + return 0; +} static int yaffsfs_PutHandle(int handle) { - yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); + yaffsfs_Handle *h = yaffsfs_HandleToPointer(handle); - if(h && h->useCount > 0){ + if(h && h->useCount > 0){ h->useCount--; if(h->useCount < 1){ - if(h->inodeId >= 0){ - yaffsfs_PutInode(h->inodeId); - h->inodeId = -1; - } + yaffsfs_PutFileDes(h->fdId); + h->fdId = -1; } } + return 0; } +static void yaffsfs_BreakDeviceHandles(struct yaffs_dev *dev) +{ + yaffsfs_FileDes *fd; + yaffsfs_Handle *h; + struct yaffs_obj *obj; + int i; + for(i = 0; i < YAFFSFS_N_HANDLES; i++){ + h = yaffsfs_HandleToPointer(i); + fd = yaffsfs_HandleToFileDes(i); + obj = yaffsfs_HandleToObject(i); + if(h && h->useCount > 0){ + h->useCount = 0; + h->fdId = 0; + } + if(fd && fd->handleCount>0 && obj && obj->my_dev == dev){ + + fd->handleCount = 0; + yaffsfs_PutInode(fd->inodeId); + fd->inodeId = -1; + } + } +} + /* * 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) { @@ -302,10 +417,10 @@ int yaffsfs_IsPathDivider(YCHAR ch) int yaffsfs_CheckNameLength(const char *name) { - int retVal = 0; + int retVal = 0; int nameLength = yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH+1); - + if(nameLength == 0){ yaffsfs_SetError(-ENOENT); retVal = -1; @@ -314,15 +429,51 @@ int yaffsfs_CheckNameLength(const char *name) retVal = -1; } - return retVal; + return retVal; +} + + +static int yaffsfs_alt_dir_path(const YCHAR *path, YCHAR **ret_path) +{ + YCHAR *alt_path = NULL; + int path_length; + int i; + + /* + * We don't have a definition for max path length. + * We will use 3 * max name length instead. + */ + *ret_path = NULL; + 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. + * eg. /foo/new_dir/ -> /foo/newdir + * Curveball: Need to handle multiple path dividers: + * eg. /foof/sdfse///// -> /foo/sdfse + */ + if(path_length > 0 && + yaffsfs_IsPathDivider(path[path_length-1])){ + alt_path = kmalloc(path_length + 1, 0); + if(!alt_path) + return -1; + yaffs_strcpy(alt_path, path); + for(i = path_length-1; + i >= 0 && yaffsfs_IsPathDivider(alt_path[i]); + i--) + alt_path[i] = (YCHAR) 0; + } + *ret_path = alt_path; + return 0; } + LIST_HEAD(yaffsfs_deviceList); /* * yaffsfs_FindDevice * yaffsfs_FindRoot - * Scan the configuration list to find the root. + * Scan the configuration list to find the device * Curveballs: Should match paths that end in '/' too * Curveball2 Might have "/x/ and "/x/y". Need to return the longest match */ @@ -397,6 +548,32 @@ static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPat return retval; } +static int yaffsfs_CheckPath(const YCHAR *path) +{ + int n=0; + int divs=0; + while(*path && n < YAFFS_MAX_NAME_LENGTH && divs < 100){ + if(yaffsfs_IsPathDivider(*path)){ + n=0; + divs++; + } else + n++; + path++; + } + + return (*path) ? -1 : 0; +} + +/* FindMountPoint only returns a dev entry if the path is a mount point */ +static struct yaffs_dev *yaffsfs_FindMountPoint(const YCHAR *path) +{ + struct yaffs_dev *dev; + YCHAR *restOfPath=NULL; + dev = yaffsfs_FindDevice(path,&restOfPath); + if(dev && restOfPath && *restOfPath) + dev = NULL; + return dev; +} static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath) { @@ -410,7 +587,8 @@ static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath) return NULL; } -static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,int symDepth) +static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj, + int symDepth, int *loop) { if(obj) @@ -421,10 +599,12 @@ static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,int symDepth) if(yaffsfs_IsPathDivider(*alias)) /* Starts with a /, need to scan from root up */ - obj = yaffsfs_FindObject(NULL,alias,symDepth++,1); + obj = yaffsfs_FindObject(NULL,alias,symDepth++, + 1,NULL,NULL,loop); else /* Relative to here, so use the parent of the symlink as a start */ - obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1); + obj = yaffsfs_FindObject(obj->parent,alias,symDepth++, + 1,NULL,NULL,loop); } return obj; } @@ -437,15 +617,19 @@ static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,int symDepth) * eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx" */ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, - const YCHAR *path, YCHAR **name, int symDepth) + const YCHAR *path, YCHAR **name, int symDepth, + int *notDir,int *loop) { struct yaffs_obj *dir; YCHAR *restOfPath; YCHAR str[YAFFS_MAX_NAME_LENGTH+1]; int i; - if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES) + if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES){ + if(loop) + *loop = 1; return NULL; + } if(startDir){ dir = startDir; @@ -454,6 +638,7 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, else dir = yaffsfs_FindRoot(path,&restOfPath); + while(dir){ /* * parse off /. @@ -479,19 +664,22 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, /* got to the end of the string */ return dir; else{ - if(yaffs_strcmp(str,_Y(".")) == 0) - { + if(yaffs_strcmp(str,_Y(".")) == 0){ /* Do nothing */ - } - else if(yaffs_strcmp(str,_Y("..")) == 0) + } else if(yaffs_strcmp(str,_Y("..")) == 0) { dir = dir->parent; - else{ + } else{ dir = yaffs_find_by_name(dir,str); - dir = yaffsfs_FollowLink(dir,symDepth); + dir = yaffsfs_FollowLink(dir,symDepth,loop); - if(dir && dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) + if(dir && dir->variant_type != + YAFFS_OBJECT_TYPE_DIRECTORY){ + if(notDir) + *notDir = 1; dir = NULL; + } + } } } @@ -499,22 +687,31 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, return NULL; } -static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relativeDirectory, - const YCHAR *path,YCHAR **name,int symDepth) +static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relDir, + const YCHAR *path, + YCHAR **name, + int symDepth, + int *notDir, + int *loop) { - return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth); + return yaffsfs_DoFindDirectory(relDir,path,name,symDepth,notDir,loop); } /* * yaffsfs_FindObject turns a path for an existing object into the object */ -static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory, const YCHAR *path,int symDepth, int getEquiv) +static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relDir, + const YCHAR *path,int symDepth, int getEquiv, + struct yaffs_obj **dirOut, int *notDir,int *loop) { struct yaffs_obj *dir; struct yaffs_obj *obj; YCHAR *name; - dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth); + dir = yaffsfs_FindDirectory(relDir,path,&name,symDepth,notDir,loop); + + if(dirOut) + *dirOut = dir; if(dir && *name) obj = yaffs_find_by_name(dir,name); @@ -528,35 +725,47 @@ static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory, } -int yaffs_dup(int fd) +/************************************************************************* + * Start of yaffsfs visible functions. + *************************************************************************/ + +int yaffs_dup(int handle) { - int newHandle = -1; - yaffsfs_Handle *oldPtr = NULL; - yaffsfs_Handle *newPtr = NULL; + int newHandleNumber = -1; + yaffsfs_FileDes *existingFD = NULL; + yaffsfs_Handle *existingHandle = NULL; + yaffsfs_Handle *newHandle = NULL; yaffsfs_Lock(); - - oldPtr = yaffsfs_GetHandlePointer(fd); - if(oldPtr && oldPtr->useCount > 0) - newHandle = yaffsfs_GetNewHandle(); - if(newHandle >= 0) - newPtr = yaffsfs_GetHandlePointer(newHandle); - - if(newPtr){ - *newPtr = *oldPtr; - return newHandle; + existingHandle = yaffsfs_HandleToPointer(handle); + existingFD = yaffsfs_HandleToFileDes(handle); + if(existingFD) + newHandleNumber = yaffsfs_NewHandle(&newHandle); + if(newHandle){ + newHandle->fdId = existingHandle->fdId; + existingFD->handleCount++; } - if(!oldPtr) + yaffsfs_Unlock(); + + if(!existingFD) yaffsfs_SetError(-EBADF); - else + else if (!newHandle) yaffsfs_SetError(-ENOMEM); - return -1; + return newHandleNumber; } +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) { @@ -564,7 +773,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) struct yaffs_obj *dir = NULL; YCHAR *name; int handle = -1; - yaffsfs_Handle *yh = NULL; + yaffsfs_FileDes *fd = NULL; int openDenied = 0; int symDepth = 0; int errorReported = 0; @@ -577,6 +786,18 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) u8 alreadyWriting; u8 readRequested; u8 writeRequested; + int notDir = 0; + int loop = 0; + + if(!path) { + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } /* O_EXCL only has meaning if O_CREAT is specified */ if(!(oflag & O_CREAT)) @@ -595,19 +816,19 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) yaffsfs_Lock(); - handle = yaffsfs_GetNewHandle(); + handle = yaffsfs_NewHandleAndFileDes(); if(handle < 0){ yaffsfs_SetError(-ENFILE); errorReported = 1; } else { - yh = yaffsfs_GetHandlePointer(handle); + fd = yaffsfs_HandleToFileDes(handle); /* try to find the exisiting object */ - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL,NULL); - obj = yaffsfs_FollowLink(obj,symDepth++); + obj = yaffsfs_FollowLink(obj,symDepth++,&loop); if(obj && obj->variant_type != YAFFS_OBJECT_TYPE_FILE && @@ -642,6 +863,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); @@ -650,31 +878,32 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) /* Check sharing of an existing object. */ if(!openDenied){ - yaffsfs_Handle *hx; + yaffsfs_FileDes *fdx; int i; + sharedReadAllowed = 1; sharedWriteAllowed = 1; alreadyReading = 0; alreadyWriting = 0; for( i = 0; i < YAFFSFS_N_HANDLES; i++){ - hx = &yaffsfs_handle[i]; - if(hx->useCount > 0 && - hx->inodeId >= 0 && - yaffsfs_inode[hx->inodeId].iObj == obj){ - if(!hx->shareRead) + fdx = &yaffsfs_fd[i]; + if(fdx->handleCount > 0 && + fdx->inodeId >= 0 && + yaffsfs_inode[fdx->inodeId].iObj == obj){ + if(!fdx->shareRead) sharedReadAllowed = 0; - if(!hx->shareWrite) + if(!fdx->shareWrite) sharedWriteAllowed = 0; - if(hx->reading) + if(fdx->reading) alreadyReading = 1; - if(hx->writing) + if(fdx->writing) alreadyWriting = 1; } } - if((!sharedReadAllowed && readRequested)|| + if((!sharedReadAllowed && readRequested)|| (!shareRead && alreadyReading) || (!sharedWriteAllowed && writeRequested) || (!shareWrite && alreadyWriting)){ @@ -690,17 +919,26 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) * the directory exists. If not, error. */ if(!obj && !errorReported){ - dir = yaffsfs_FindDirectory(NULL,path,&name,0); - if(!dir){ + dir = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop); + if(!dir && notDir){ yaffsfs_SetError(-ENOTDIR); errorReported = 1; + } else if(loop){ + yaffsfs_SetError(-ELOOP); + errorReported = 1; + } else if(!dir){ + yaffsfs_SetError(-ENOENT); + errorReported = 1; } } 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 if(yaffsfs_TooManyObjects(dir->my_dev)) { + yaffsfs_SetError(-ENFILE); errorReported = 1; } else obj = yaffs_create_file(dir,name,mode,0,0); @@ -723,26 +961,26 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) if(inodeId<0) { /* * Todo: Fix any problem if inodes run out, though that - * can't happen if the number of inode items >= number of handles. + * can't happen if the number of inode items >= number of handles. */ } - - yh->inodeId = inodeId; - yh->reading = readRequested; - yh->writing = writeRequested; - yh->append = (oflag & O_APPEND) ? 1 : 0; - yh->position = 0; - yh->shareRead = shareRead; - yh->shareWrite = shareWrite; + + fd->inodeId = inodeId; + fd->reading = readRequested; + fd->writing = writeRequested; + fd->append = (oflag & O_APPEND) ? 1 : 0; + fd->position = 0; + fd->shareRead = shareRead; + fd->shareWrite = shareWrite; /* Hook inode to object */ obj->my_inode = (void*) &yaffsfs_inode[inodeId]; - if((oflag & O_TRUNC) && yh->writing) + if((oflag & O_TRUNC) && fd->writing) yaffs_resize_file(obj,0); } else { yaffsfs_PutHandle(handle); - if(!errorReported) + if(!errorReported) yaffsfs_SetError(0); /* Problem */ handle = -1; } @@ -755,25 +993,26 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) int yaffs_open(const YCHAR *path, int oflag, int mode) { - return yaffs_open_sharing(path, oflag, mode, YAFFS_SHARE_READ | YAFFS_SHARE_WRITE); + return yaffs_open_sharing(path, oflag, mode, + YAFFS_SHARE_READ | YAFFS_SHARE_WRITE); } -int yaffs_Dofsync(int fd,int datasync) +int yaffs_Dofsync(int handle,int datasync) { - yaffsfs_Handle *h = NULL; - int retVal = 0; + int retVal = -1; + struct yaffs_obj *obj; yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); + obj = yaffsfs_HandleToObject(handle); - if(h && h->useCount > 0) - /* flush the file */ - yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync); - else { - /* bad handle */ + if(!obj) yaffsfs_SetError(-EBADF); - retVal = -1; + else if(obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else { + yaffs_flush_file(obj,1,datasync); + retVal = 0; } yaffsfs_Unlock(); @@ -781,39 +1020,39 @@ int yaffs_Dofsync(int fd,int datasync) return retVal; } -int yaffs_fsync(int fd) +int yaffs_fsync(int handle) { - return yaffs_Dofsync(fd,0); + return yaffs_Dofsync(handle,0); } -int yaffs_flush(int fd) +int yaffs_flush(int handle) { - return yaffs_fsync(fd); + return yaffs_fsync(handle); } -int yaffs_fdatasync(int fd) +int yaffs_fdatasync(int handle) { - return yaffs_Dofsync(fd,1); + return yaffs_Dofsync(handle,1); } -int yaffs_close(int fd) +int yaffs_close(int handle) { yaffsfs_Handle *h = NULL; - int retVal = 0; + struct yaffs_obj *obj = NULL; + int retVal = -1; yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); + h = yaffsfs_HandleToPointer(handle); + obj = yaffsfs_HandleToObject(handle); - if(h && h->useCount > 0) { + if(!h || !obj) + yaffsfs_SetError(-EBADF); + else { /* clean up */ - yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,0); - yaffsfs_PutHandle(fd); + yaffs_flush_file(obj,1,0); + yaffsfs_PutHandle(handle); retVal = 0; - } else { - /* bad handle */ - yaffsfs_SetError(-EBADF); - retVal = -1; } yaffsfs_Unlock(); @@ -823,38 +1062,47 @@ int yaffs_close(int fd) -int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int offset) +int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte, int isPread, loff_t offset) { - yaffsfs_Handle *h = NULL; + yaffsfs_FileDes *fd = NULL; struct yaffs_obj *obj = NULL; - int pos = 0; - int startPos = 0; + loff_t pos = 0; + loff_t startPos = 0; + loff_t endPos = 0; int nRead = 0; int nToRead = 0; int totalRead = 0; - unsigned int maxRead; + loff_t maxRead; u8 *buf = (u8 *)vbuf; + if(!vbuf){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); + fd = yaffsfs_HandleToFileDes(handle); + obj = yaffsfs_HandleToObject(handle); - if(!h || !obj){ + if(!fd || !obj){ /* bad handle */ yaffsfs_SetError(-EBADF); totalRead = -1; - } else if(!h->reading){ + } else if(!fd->reading){ /* Not a reading handle */ yaffsfs_SetError(-EINVAL); totalRead = -1; + } else if(nbyte > YAFFS_MAX_FILE_SIZE){ + yaffsfs_SetError(-EINVAL); + totalRead = -1; } else { if(isPread) startPos = offset; else - startPos = h->position; + startPos = fd->position; pos = startPos; - + if(yaffs_get_obj_length(obj) > pos) maxRead = yaffs_get_obj_length(obj) - pos; else @@ -864,13 +1112,31 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off nbyte = maxRead; - yaffsfs_GetHandle(fd); + yaffsfs_GetHandle(handle); + + endPos = pos + nbyte; + + if(pos < 0 || pos > YAFFS_MAX_FILE_SIZE || + nbyte > YAFFS_MAX_FILE_SIZE || + endPos < 0 || endPos > YAFFS_MAX_FILE_SIZE){ + totalRead = -1; + nbyte = 0; + } while(nbyte > 0) { nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); if(nToRead > nbyte) nToRead = nbyte; - nRead = yaffs_file_rd(obj,buf,pos,nToRead); + + /* Tricky bit... + * Need to reverify object in case the device was + * unmounted in another thread. + */ + obj = yaffsfs_HandleToObject(handle); + if(!obj) + nRead = 0; + else + nRead = yaffs_file_rd(obj,buf,pos,nToRead); if(nRead > 0){ totalRead += nRead; @@ -882,8 +1148,8 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off nbyte-=nRead; else nbyte = 0; /* no more to read */ - - + + if(nbyte > 0){ yaffsfs_Unlock(); yaffsfs_Lock(); @@ -891,14 +1157,13 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off } - yaffsfs_PutHandle(fd); + yaffsfs_PutHandle(handle); if(!isPread) { if(totalRead >= 0) - h->position = startPos + totalRead; - else { - /* todo error */ - } + fd->position = startPos + totalRead; + else + yaffsfs_SetError(-EINVAL); } } @@ -909,55 +1174,83 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off } -int yaffs_read(int fd, void *buf, unsigned int nbyte) +int yaffs_read(int handle, void *buf, unsigned int nbyte) { - return yaffsfs_do_read(fd, buf, nbyte, 0, 0); + return yaffsfs_do_read(handle, buf, nbyte, 0, 0); } -int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset) +int yaffs_pread(int handle, void *buf, unsigned int nbyte, loff_t offset) { - return yaffsfs_do_read(fd, buf, nbyte, 1, offset); + return yaffsfs_do_read(handle, buf, nbyte, 1, offset); } -int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, int offset) +int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte, int isPwrite, loff_t offset) { - yaffsfs_Handle *h = NULL; + yaffsfs_FileDes *fd = NULL; struct yaffs_obj *obj = NULL; - int pos = 0; - int startPos = 0; + loff_t pos = 0; + loff_t startPos = 0; + loff_t endPos; int nWritten = 0; int totalWritten = 0; int write_trhrough = 0; int nToWrite = 0; const u8 *buf = (const u8 *)vbuf; + if(!vbuf){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); + fd = yaffsfs_HandleToFileDes(handle); + obj = yaffsfs_HandleToObject(handle); - if(!h || !obj){ + if(!fd || !obj){ /* bad handle */ yaffsfs_SetError(-EBADF); totalWritten = -1; - } else if( h && obj && (!h->writing || obj->my_dev->read_only)){ + } else if(!fd->writing){ yaffsfs_SetError(-EINVAL); totalWritten=-1; + } else if(obj->my_dev->read_only){ + yaffsfs_SetError(-EROFS); + totalWritten=-1; } else { - if(h->append) + if(fd->append) startPos = yaffs_get_obj_length(obj); else if(isPwrite) startPos = offset; else - startPos = h->position; + startPos = fd->position; - yaffsfs_GetHandle(fd); + yaffsfs_GetHandle(handle); pos = startPos; + endPos = pos + nbyte; + + if(pos < 0 || pos > YAFFS_MAX_FILE_SIZE || + nbyte > YAFFS_MAX_FILE_SIZE || + endPos < 0 || endPos > YAFFS_MAX_FILE_SIZE){ + totalWritten = -1; + nbyte = 0; + } + while(nbyte > 0) { + nToWrite = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); if(nToWrite > nbyte) nToWrite = nbyte; - nWritten = yaffs_wr_file(obj,buf,pos,nToWrite,write_trhrough); + /* Tricky bit... + * Need to reverify object in case the device was + * remounted or unmounted in another thread. + */ + obj = yaffsfs_HandleToObject(handle); + if(!obj || obj->my_dev->read_only) + nWritten = 0; + else + nWritten = yaffs_wr_file(obj,buf,pos,nToWrite, + write_trhrough); if(nWritten > 0){ totalWritten += nWritten; pos += nWritten; @@ -980,14 +1273,13 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, } } - yaffsfs_PutHandle(fd); + yaffsfs_PutHandle(handle); if(!isPwrite){ if(totalWritten > 0) - h->position = startPos + totalWritten; - else { - /* todo error */ - } + fd->position = startPos + totalWritten; + else + yaffsfs_SetError(-EINVAL); } } @@ -1001,94 +1293,119 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte) return yaffsfs_do_write(fd, buf, nbyte, 0, 0); } -int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offset) +int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, loff_t offset) { return yaffsfs_do_write(fd, buf, nbyte, 1, offset); } -int yaffs_truncate(const YCHAR *path,off_t new_size) +int yaffs_truncate(const YCHAR *path,loff_t new_size) { struct yaffs_obj *obj = NULL; + struct yaffs_obj *dir = NULL; int result = YAFFS_FAIL; + int notDir = 0; + int loop = 0; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(!obj) + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + 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) - yaffsfs_SetError(-EACCES); + yaffsfs_SetError(-EROFS); else if(new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE) yaffsfs_SetError(-EINVAL); else - result = yaffs_resize_file(obj,new_size); + result = yaffs_resize_file(obj, new_size); yaffsfs_Unlock(); return (result) ? 0 : -1; } -int yaffs_ftruncate(int fd, off_t new_size) +int yaffs_ftruncate(int handle, loff_t new_size) { - yaffsfs_Handle *h = NULL; + yaffsfs_FileDes *fd = NULL; struct yaffs_obj *obj = NULL; int result = 0; yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); + fd = yaffsfs_HandleToFileDes(handle); + obj = yaffsfs_HandleToObject(handle); - if(!h || !obj) + if(!fd || !obj) /* bad handle */ yaffsfs_SetError(-EBADF); + else if(!fd->writing) + yaffsfs_SetError(-EINVAL); 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 /* resize the file */ - result = yaffs_resize_file(obj,new_size); + result = yaffs_resize_file(obj, new_size); yaffsfs_Unlock(); return (result) ? 0 : -1; } -off_t yaffs_lseek(int fd, off_t offset, int whence) +loff_t yaffs_lseek(int handle, loff_t offset, int whence) { - yaffsfs_Handle *h = NULL; + yaffsfs_FileDes *fd = NULL; struct yaffs_obj *obj = NULL; - int pos = -1; - int fSize = -1; + loff_t pos = -1; + loff_t fSize = -1; yaffsfs_Lock(); - h = yaffsfs_GetHandlePointer(fd); - obj = yaffsfs_GetHandleObject(fd); + fd = yaffsfs_HandleToFileDes(handle); + obj = yaffsfs_HandleToObject(handle); - if(!h || !obj){ - /* bad handle */ + if(!fd || !obj) yaffsfs_SetError(-EBADF); - } else { + else if(offset > YAFFS_MAX_FILE_SIZE) + yaffsfs_SetError(-EINVAL); + else { if(whence == SEEK_SET){ if(offset >= 0) pos = offset; } else if(whence == SEEK_CUR) { - if( (h->position + offset) >= 0) - pos = (h->position + offset); + if( (fd->position + offset) >= 0) + pos = (fd->position + offset); } else if(whence == SEEK_END) { fSize = yaffs_get_obj_length(obj); if(fSize >= 0 && (fSize + offset) >= 0) pos = fSize + offset; - } + } - if(pos >= 0) - h->position = pos; - else + if(pos >= 0 && pos <= YAFFS_MAX_FILE_SIZE) + fd->position = pos; + else{ yaffsfs_SetError(-EINVAL); + pos = -1; + } } yaffsfs_Unlock(); @@ -1103,21 +1420,42 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) struct yaffs_obj *obj = NULL; YCHAR *name; int result = YAFFS_FAIL; + int notDir = 0; + int loop = 0; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,0); - dir = yaffsfs_FindDirectory(NULL,path,&name,0); - if(!dir) + obj = yaffsfs_FindObject(NULL,path,0,0,NULL,NULL,NULL); + dir = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop); + + if(!dir && notDir) yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir) + yaffsfs_SetError(-ENOENT); + else if(yaffs_strncmp(name,_Y("."),2) == 0) + yaffsfs_SetError(-EINVAL); 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) yaffsfs_SetError(-ENOTDIR); + else if(isDirectory && obj == obj->my_dev->root_dir) + yaffsfs_SetError(-EBUSY); /* Can't rmdir a root */ else { result = yaffs_unlinker(dir,name); @@ -1127,17 +1465,10 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) yaffsfs_Unlock(); - /* todo error */ - return (result == YAFFS_FAIL) ? -1 : 0; } -int yaffs_rmdir(const YCHAR *path) -{ - return yaffsfs_DoUnlink(path,1); -} - int yaffs_unlink(const YCHAR *path) { return yaffsfs_DoUnlink(path,0); @@ -1148,24 +1479,71 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) struct yaffs_obj *olddir = NULL; struct yaffs_obj *newdir = NULL; struct yaffs_obj *obj = NULL; + struct yaffs_obj *newobj = NULL; YCHAR *oldname; YCHAR *newname; int result= YAFFS_FAIL; int rename_allowed = 1; + int notOldDir = 0; + int notNewDir = 0; + int oldLoop = 0; + int newLoop = 0; + + YCHAR *alt_newpath=NULL; + + if(!oldPath || !newPath){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(oldPath) < 0 || + yaffsfs_CheckPath(newPath) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + if(yaffsfs_alt_dir_path(newPath, &alt_newpath) < 0){ + yaffsfs_SetError(-ENOMEM); + return -1; + } + if(alt_newpath) + newPath = alt_newpath; yaffsfs_Lock(); - olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0); - newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0); - obj = yaffsfs_FindObject(NULL,oldPath,0,0); - if(!olddir || !newdir || !obj) { - /* bad file */ - yaffsfs_SetError(-EBADF); + olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0,¬OldDir,&oldLoop); + newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0,¬NewDir,&newLoop); + obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL,NULL,NULL); + newobj = yaffsfs_FindObject(NULL,newPath,0,0,NULL,NULL,NULL); + + /* If the object being renamed is a directory and the + * path ended with a "/" then the olddir == obj. + * We pass through NULL for the old name to tell the lower layers + * to use olddir as the object. + */ + + if(olddir == obj) + oldname = NULL; + + if((!olddir && notOldDir) || (!newdir && notNewDir)) { + yaffsfs_SetError(-ENOTDIR); rename_allowed = 0; - } else if(obj->my_dev->read_only){ + } else if(oldLoop || newLoop) { + yaffsfs_SetError(-ELOOP); + rename_allowed = 0; + } else if (olddir && oldname && yaffs_strncmp(oldname, _Y("."),2) == 0){ yaffsfs_SetError(-EINVAL); rename_allowed = 0; + }else if(!olddir || !newdir || !obj) { + yaffsfs_SetError(-ENOENT); + rename_allowed = 0; + } else if(obj->my_dev->read_only){ + yaffsfs_SetError(-EROFS); + rename_allowed = 0; + } else if(yaffs_is_non_empty_dir(newobj)){ + yaffsfs_SetError(-ENOTEMPTY); + rename_allowed = 0; } else if(olddir->my_dev != newdir->my_dev) { /* Rename must be on same device */ yaffsfs_SetError(-EXDEV); @@ -1174,7 +1552,8 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) /* * It is a directory, check that it is not being renamed to * being its own decendent. - * Do this by tracing from the new directory back to the root, checking for obj + * Do this by tracing from the new directory back to the root, + * checking for obj */ struct yaffs_obj *xx = newdir; @@ -1185,7 +1564,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) xx = xx->parent; } if(!rename_allowed) - yaffsfs_SetError(-EACCES); + yaffsfs_SetError(-EINVAL); } if(rename_allowed) @@ -1193,6 +1572,9 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) yaffsfs_Unlock(); + if(alt_newpath) + kfree(alt_newpath); + return (result == YAFFS_FAIL) ? -1 : 0; } @@ -1241,22 +1623,37 @@ static int yaffsfs_DoStat(struct yaffs_obj *obj,struct yaffs_stat *buf) static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat) { - struct yaffs_obj *obj; - + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; int retVal = -1; + int notDir = 0; + int loop = 0; + + if(!path || !buf){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); if(!doLStat && obj) - obj = yaffsfs_FollowLink(obj,0); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(obj) - retVal = yaffsfs_DoStat(obj,buf); - else - /* todo error not found */ + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); + else + retVal = yaffsfs_DoStat(obj,buf); yaffsfs_Unlock(); @@ -1280,8 +1677,13 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf) int retVal = -1; + if(!buf){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj) retVal = yaffsfs_DoStat(obj,buf); @@ -1294,32 +1696,139 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf) return retVal; } +static int yaffsfs_DoUtime(struct yaffs_obj *obj,const struct yaffs_utimbuf *buf) +{ + int retVal = -1; + int result; + + struct yaffs_utimbuf local; + + obj = yaffs_get_equivalent_obj(obj); + + if(obj && obj->my_dev->read_only) { + yaffsfs_SetError(-EROFS); + return -1; + } + + + if(!buf){ + local.actime = Y_CURRENT_TIME; + local.modtime = local.actime; + buf = &local; + } + + if(obj){ + obj->yst_atime = buf->actime; + obj->yst_mtime = buf->modtime; + obj->dirty = 1; + result = yaffs_flush_file(obj,0,0); + retVal = result == YAFFS_OK ? 0 : -1; + } + + return retVal; +} + +int yaffs_utime(const YCHAR *path, const struct yaffs_utimbuf *buf) +{ + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; + int retVal = -1; + int notDir = 0; + int loop = 0; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + yaffsfs_Lock(); + + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); + + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else + retVal = yaffsfs_DoUtime(obj,buf); + + yaffsfs_Unlock(); + + return retVal; + +} +int yaffs_futime(int fd, const struct yaffs_utimbuf *buf) +{ + struct yaffs_obj *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_HandleToObject(fd); + + if(obj) + retVal = yaffsfs_DoUtime(obj,buf); + else + /* bad handle */ + yaffsfs_SetError(-EBADF); + + yaffsfs_Unlock(); + + return retVal; +} + + #ifndef CONFIG_YAFFS_WINCE /* xattrib functions */ -static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags, int follow) +static int yaffs_do_setxattr(const YCHAR *path, const char *name, + const void *data, int size, int flags, int follow) { struct yaffs_obj *obj; + struct yaffs_obj *dir; + int notDir = 0; + int loop = 0; int retVal = -1; + if(!path || !name || !data){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); if(follow) - obj = yaffsfs_FollowLink(obj,0); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(obj) { + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else { retVal = yaffs_set_xattrib(obj,name,data,size,flags); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; } - } else - /* todo error not found */ - yaffsfs_SetError(-ENOENT); + } yaffsfs_Unlock(); @@ -1345,18 +1854,23 @@ int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int fl int retVal = -1; + if(!name || !data){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); - if(obj) { + if(!obj) + yaffsfs_SetError(-EBADF); + else { retVal = yaffs_set_xattrib(obj,name,data,size,flags); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; } - } else - /* bad handle */ - yaffsfs_SetError(-EBADF); + } yaffsfs_Unlock(); @@ -1366,26 +1880,41 @@ int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int fl static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, int size, int follow) { struct yaffs_obj *obj; - + struct yaffs_obj *dir; int retVal = -1; + int notDir = 0; + int loop = 0; + + if(!path || !name || !data ){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); if(follow) - obj = yaffsfs_FollowLink(obj,0); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(obj) { + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else { retVal = yaffs_get_xattrib(obj,name,data,size); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; } - } else - /* todo error not found */ - yaffsfs_SetError(-ENOENT); - + } yaffsfs_Unlock(); return retVal; @@ -1409,8 +1938,13 @@ int yaffs_fgetxattr(int fd, const char *name, void *data, int size) int retVal = -1; + if(!name || !data ){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj) { retVal = yaffs_get_xattrib(obj,name,data,size); @@ -1429,26 +1963,42 @@ int yaffs_fgetxattr(int fd, const char *name, void *data, int size) static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follow) { - struct yaffs_obj *obj; - + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; int retVal = -1; + int notDir = 0; + int loop = 0; + + if(!path || !data ){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir,&loop); if(follow) - obj = yaffsfs_FollowLink(obj,0); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(obj) { + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else { retVal = yaffs_list_xattrib(obj, data,size); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; } - } else - /* todo error not found */ - yaffsfs_SetError(-ENOENT); + } yaffsfs_Unlock(); @@ -1472,8 +2022,13 @@ int yaffs_flistxattr(int fd, char *data, int size) int retVal = -1; + if(!data ){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj) { retVal = yaffs_list_xattrib(obj,data,size); @@ -1492,26 +2047,42 @@ int yaffs_flistxattr(int fd, char *data, int size) static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow) { - struct yaffs_obj *obj; - + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; + int notDir = 0; + int loop = 0; int retVal = -1; + if(!path || !name){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); if(follow) - obj = yaffsfs_FollowLink(obj,0); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(obj) { + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else { retVal = yaffs_remove_xattrib(obj,name); if(retVal< 0){ yaffsfs_SetError(retVal); retVal = -1; } - } else - /* todo error not found */ - yaffsfs_SetError(-ENOENT); + } yaffsfs_Unlock(); @@ -1535,8 +2106,13 @@ int yaffs_fremovexattr(int fd, const char *name) int retVal = -1; + if(!name){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj){ retVal = yaffs_remove_xattrib(obj,name); @@ -1562,7 +2138,7 @@ int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned * int retVal = -1; yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj){ @@ -1583,17 +2159,17 @@ int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned * retVal = 0; } else /* bad handle */ - yaffsfs_SetError(-EBADF); - + yaffsfs_SetError(-EBADF); + yaffsfs_Unlock(); - + return retVal; } -int yaffs_set_wince_times(int fd, - const unsigned *wctime, - const unsigned *watime, +int yaffs_set_wince_times(int fd, + const unsigned *wctime, + const unsigned *watime, const unsigned *wmtime) { struct yaffs_obj *obj; @@ -1601,7 +2177,7 @@ int yaffs_set_wince_times(int fd, int retVal = -1; yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(obj){ @@ -1652,9 +2228,21 @@ static int yaffsfs_DoChMod(struct yaffs_obj *obj,mode_t mode) int yaffs_access(const YCHAR *path, int amode) { - struct yaffs_obj *obj; + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; + int notDir = 0; + int loop = 0; + int retval = -1; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } - int retval = 0; + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } if(amode & ~(R_OK | W_OK | X_OK)){ yaffsfs_SetError(-EINVAL); @@ -1663,9 +2251,18 @@ int yaffs_access(const YCHAR *path, int amode) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(obj) { + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) + yaffsfs_SetError(-ENOENT); + else if((amode & W_OK) && obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else{ int access_ok = 1; if((amode & R_OK) && !(obj->yst_mode & S_IREAD)) @@ -1675,14 +2272,10 @@ int yaffs_access(const YCHAR *path, int amode) if((amode & X_OK) && !(obj->yst_mode & S_IEXEC)) access_ok = 0; - if(!access_ok) { + if(!access_ok) yaffsfs_SetError(-EACCES); - retval = -1; - } - } else { - /* todo error not found */ - yaffsfs_SetError(-ENOENT); - retval = -1; + else + retval = 0; } yaffsfs_Unlock(); @@ -1694,18 +2287,40 @@ int yaffs_access(const YCHAR *path, int amode) int yaffs_chmod(const YCHAR *path, mode_t mode) { - struct yaffs_obj *obj; - + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; int retVal = -1; + int notDir = 0; + int loop = 0; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + if(mode & ~(0777)){ + yaffsfs_SetError(-EINVAL); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir, ¬Dir,&loop); + obj = yaffsfs_FollowLink(obj,0,&loop); - if(!obj) + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); else if(obj->my_dev->read_only) - yaffsfs_SetError(-EINVAL); + yaffsfs_SetError(-EROFS); else retVal = yaffsfs_DoChMod(obj,mode); @@ -1719,16 +2334,20 @@ int yaffs_chmod(const YCHAR *path, mode_t mode) int yaffs_fchmod(int fd, mode_t mode) { struct yaffs_obj *obj; - int retVal = -1; + if(mode & ~(0777)){ + yaffsfs_SetError(-EINVAL); + return -1; + } + yaffsfs_Lock(); - obj = yaffsfs_GetHandleObject(fd); + obj = yaffsfs_HandleToObject(fd); if(!obj) - yaffsfs_SetError(-ENOENT); + yaffsfs_SetError(-EBADF); else if(obj->my_dev->read_only) - yaffsfs_SetError(-EINVAL); + yaffsfs_SetError(-EROFS); else retVal = yaffsfs_DoChMod(obj,mode); @@ -1737,77 +2356,94 @@ int yaffs_fchmod(int fd, mode_t mode) return retVal; } - int yaffs_mkdir(const YCHAR *path, mode_t mode) { struct yaffs_obj *parent = NULL; struct yaffs_obj *dir = NULL; YCHAR *name; - YCHAR *use_path = NULL; - int path_length = 0; + YCHAR *alt_path = NULL; int retVal= -1; - int i; + int notDir = 0; + int loop = 0; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } - /* - * We don't have a definition for max path length. - * We will use 3 * max name length instead. - */ - - path_length = strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1); + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } - /* If the last character is a path divider, then we need to - * trim it back so that the name look-up works properly. - * eg. /foo/new_dir/ -> /foo/newdir - * Curveball: Need to handle multiple path dividers: - * eg. /foof/sdfse///// -> /foo/sdfse - */ - if(path_length > 0 && - yaffsfs_IsPathDivider(path[path_length-1])){ - use_path = YMALLOC(path_length + 1); - if(!use_path){ - yaffsfs_SetError(-ENOMEM); - return -1; - } - strcpy(use_path, path); - for(i = path_length-1; - i >= 0 && yaffsfs_IsPathDivider(use_path[i]); - i--) - use_path[i] = (YCHAR) 0; - path = use_path; + if(yaffsfs_alt_dir_path(path, &alt_path) < 0){ + yaffsfs_SetError(-ENOMEM); + return -1; } - + if(alt_path) + path = alt_path; + yaffsfs_Lock(); - parent = yaffsfs_FindDirectory(NULL,path,&name,0); - if(parent && yaffs_strnlen(name,5) == 0){ + parent = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir,&loop); + if(!parent && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!parent) + yaffsfs_SetError(-ENOENT); + 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 && parent->my_dev->read_only){ - yaffsfs_SetError(-EINVAL); - } else { - if(parent) - dir = yaffs_create_dir(parent,name,mode,0,0); + } else if(parent->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else { + dir = yaffs_create_dir(parent,name,mode,0,0); if(dir) retVal = 0; - else { - if(!parent) - yaffsfs_SetError(-ENOENT); /* missing path */ - else if (yaffs_find_by_name(parent,name)) - yaffsfs_SetError(-EEXIST); /* the name already exists */ - else - yaffsfs_SetError(-ENOSPC); /* just assume no space */ - retVal = -1; - } + else if (yaffs_find_by_name(parent,name)) + yaffsfs_SetError(-EEXIST); /* the name already exists */ + else + yaffsfs_SetError(-ENOSPC); /* just assume no space */ } yaffsfs_Unlock(); - if(use_path) - YFREE(use_path); + if(alt_path) + kfree(alt_path); return retVal; } +int yaffs_rmdir(const YCHAR *path) +{ + int result; + YCHAR *alt_path; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + if(yaffsfs_alt_dir_path(path, &alt_path) < 0){ + yaffsfs_SetError(-ENOMEM); + return -1; + } + if(alt_path) + path = alt_path; + result = yaffsfs_DoUnlink(path,1); + if(alt_path) + kfree(alt_path); + return result; +} + + void * yaffs_getdev(const YCHAR *path) { struct yaffs_dev *dev=NULL; @@ -1816,35 +2452,49 @@ void * yaffs_getdev(const YCHAR *path) return (void *)dev; } -int yaffs_mount2(const YCHAR *path,int read_only) +int yaffs_mount_common(const YCHAR *path,int read_only, int skip_checkpt) { int retVal=-1; int result=YAFFS_FAIL; struct yaffs_dev *dev=NULL; - YCHAR *dummy; - T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path)); + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + yaffs_trace(YAFFS_TRACE_MOUNT,"yaffs: Mounting %s",path); + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); yaffsfs_InitHandles(); - dev = yaffsfs_FindDevice(path,&dummy); + dev = yaffsfs_FindMountPoint(path); if(dev){ if(!dev->is_mounted){ dev->read_only = read_only ? 1 : 0; - result = yaffs_guts_initialise(dev); + if(skip_checkpt) { + u8 skip = dev->param.skip_checkpt_rd; + dev->param.skip_checkpt_rd = 1; + result = yaffs_guts_initialise(dev); + dev->param.skip_checkpt_rd = skip; + } else { + result = yaffs_guts_initialise(dev); + } + if(result == YAFFS_FAIL) - /* todo error - mount failed */ yaffsfs_SetError(-ENOMEM); retVal = result ? 0 : -1; } else - /* todo error - already mounted. */ yaffsfs_SetError(-EBUSY); } else - /* todo error - no device */ yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); @@ -1852,9 +2502,13 @@ int yaffs_mount2(const YCHAR *path,int read_only) } +int yaffs_mount2(const YCHAR *path, int readonly) +{ + return yaffs_mount_common(path, readonly, 0); +} int yaffs_mount(const YCHAR *path) { - return yaffs_mount2(path,0); + return yaffs_mount_common(path, 0, 0); } int yaffs_sync(const YCHAR *path) @@ -1862,26 +2516,50 @@ int yaffs_sync(const YCHAR *path) int retVal=-1; struct yaffs_dev *dev=NULL; YCHAR *dummy; - + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + 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 - /* todo error - not mounted. */ - yaffsfs_SetError(-EINVAL); - + + } }else - /* todo error - no device */ yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); - return retVal; + return retVal; +} + + +static int yaffsfs_IsDevBusy(struct yaffs_dev * dev) +{ + int i; + struct yaffs_obj *obj; + + for(i = 0; i < YAFFSFS_N_HANDLES; i++){ + obj = yaffsfs_HandleToObject(i); + if(obj && obj->my_dev == dev) + return 1; + } + return 0; } @@ -1889,23 +2567,24 @@ int yaffs_remount(const YCHAR *path, int force, int read_only) { int retVal=-1; struct yaffs_dev *dev=NULL; - YCHAR *dummy; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - dev = yaffsfs_FindDevice(path,&dummy); + dev = yaffsfs_FindMountPoint(path); if(dev){ if(dev->is_mounted){ - int i; - int inUse; - yaffs_flush_whole_cache(dev); - for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){ - if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev) - inUse = 1; /* the device is in use, can't unmount */ - } - - if(!inUse || force){ + if(force || ! yaffsfs_IsDevBusy(dev)){ if(read_only) yaffs_checkpoint_save(dev); dev->read_only = read_only ? 1 : 0; @@ -1929,38 +2608,38 @@ int yaffs_unmount2(const YCHAR *path, int force) { int retVal=-1; struct yaffs_dev *dev=NULL; - YCHAR *dummy; + + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - dev = yaffsfs_FindDevice(path,&dummy); + dev = yaffsfs_FindMountPoint(path); if(dev){ if(dev->is_mounted){ - int i; int inUse; - yaffs_flush_whole_cache(dev); yaffs_checkpoint_save(dev); - - for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){ - if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev) - inUse = 1; /* the device is in use, can't unmount */ - } - + inUse = yaffsfs_IsDevBusy(dev); if(!inUse || force){ + if(inUse) + yaffsfs_BreakDeviceHandles(dev); yaffs_deinitialise(dev); retVal = 0; } else - /* todo error can't unmount as files are open */ yaffsfs_SetError(-EBUSY); } else - /* todo error - not mounted. */ yaffsfs_SetError(-EINVAL); - } - else - /* todo error - no device */ + } else yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); @@ -1979,6 +2658,16 @@ loff_t yaffs_freespace(const YCHAR *path) struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); if(dev && dev->is_mounted){ @@ -1998,10 +2687,21 @@ loff_t yaffs_totalspace(const YCHAR *path) struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); if(dev && dev->is_mounted){ - retVal = (dev->param.end_block - dev->param.start_block + 1) - dev->param.n_reserved_blocks; + retVal = (dev->param.end_block - dev->param.start_block + 1) - + dev->param.n_reserved_blocks; retVal *= dev->param.chunks_per_block; retVal *= dev->data_bytes_per_chunk; @@ -2018,6 +2718,16 @@ int yaffs_inodecount(const YCHAR *path) struct yaffs_dev *dev=NULL; YCHAR *dummy; + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); if(dev && dev->is_mounted) { @@ -2025,17 +2735,25 @@ int yaffs_inodecount(const YCHAR *path) if(n_obj > dev->n_hardlinks) retVal = n_obj - dev->n_hardlinks; } - + if(retVal < 0) yaffsfs_SetError(-EINVAL); - + yaffsfs_Unlock(); - return retVal; + return retVal; } 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; @@ -2070,7 +2788,7 @@ typedef struct struct yaffs_obj *dirObj; /* ptr to directory being searched */ struct yaffs_obj *nextReturn; /* obj to be returned by next readddir */ int offset; - struct list_head others; + struct list_head others; } yaffsfs_DirectorySearchContext; @@ -2147,14 +2865,34 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname) yaffs_DIR *dir = NULL; struct yaffs_obj *obj = NULL; yaffsfs_DirectorySearchContext *dsc = NULL; + int notDir = 0; + int loop = 0; + + if(!dirname){ + yaffsfs_SetError(-EFAULT); + return NULL; + } + + if(yaffsfs_CheckPath(dirname) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return NULL; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,dirname,0,1); + obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL,¬Dir,&loop); - if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){ + if(!obj && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!obj) + yaffsfs_SetError(-ENOENT); + else if(obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) + yaffsfs_SetError(-ENOTDIR); + else { - dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext)); + dsc = kmalloc(sizeof(yaffsfs_DirectorySearchContext), 0); dir = (yaffs_DIR *)dsc; if(dsc){ @@ -2167,7 +2905,7 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname) if(!search_contexts.next) INIT_LIST_HEAD(&search_contexts); - list_add(&dsc->others,&search_contexts); + list_add(&dsc->others,&search_contexts); yaffsfs_SetDirRewound(dsc); } @@ -2228,10 +2966,15 @@ int yaffs_closedir(yaffs_DIR *dirp) { yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp; + if(!dsc){ + yaffsfs_SetError(-EFAULT); + return -1; + } + yaffsfs_Lock(); dsc->magic = 0; list_del(&dsc->others); /* unhook from list */ - YFREE(dsc); + kfree(dsc); yaffsfs_Unlock(); return 0; } @@ -2246,22 +2989,40 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) YCHAR *name; int retVal= -1; int mode = 0; /* ignore for now */ + int notDir = 0; + int loop = 0; + + if(!oldpath || !newpath){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(newpath) < 0 || + yaffsfs_CheckPath(oldpath) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - parent = yaffsfs_FindDirectory(NULL,newpath,&name,0); - if(parent && parent->my_dev->read_only) - yaffsfs_SetError(-EINVAL); + parent = yaffsfs_FindDirectory(NULL,newpath,&name,0,¬Dir,&loop); + if(!parent && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + 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){ obj = yaffs_create_symlink(parent,name,mode,0,0,oldpath); if(obj) retVal = 0; - else{ - yaffsfs_SetError(-ENOSPC); /* just assume no space for now */ - retVal = -1; - } - } else { - yaffsfs_SetError(-EINVAL); - retVal = -1; + else if (yaffsfs_FindObject(NULL,newpath,0,0, NULL,NULL,NULL)) + yaffsfs_SetError(-EEXIST); + else + yaffsfs_SetError(-ENOSPC); } yaffsfs_Unlock(); @@ -2273,19 +3034,29 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz) { struct yaffs_obj *obj = NULL; - int retVal; + struct yaffs_obj *dir = NULL; + int retVal= -1; + int notDir = 0; + int loop = 0; + + if(!path || !buf){ + yaffsfs_SetError(-EFAULT); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir,&loop); - if(!obj) { + if(!dir && notDir) + yaffsfs_SetError(-ENOTDIR); + else if(loop) + yaffsfs_SetError(-ELOOP); + else if(!dir || !obj) yaffsfs_SetError(-ENOENT); - retVal = -1; - } else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK) { + else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK) yaffsfs_SetError(-EINVAL); - retVal = -1; - } else { + else { YCHAR *alias = obj->variant.symlink_variant.alias; memset(buf,0,bufsiz); yaffs_strncpy(buf,alias,bufsiz - 1); @@ -2295,54 +3066,62 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz) return retVal; } -int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath) +int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath) { /* Creates a link called newpath to existing oldpath */ struct yaffs_obj *obj = NULL; - struct yaffs_obj *target = NULL; - int retVal = 0; + struct yaffs_obj *lnk = NULL; + struct yaffs_obj *obj_dir = NULL; + struct yaffs_obj *lnk_dir = NULL; + int retVal = -1; + int notDirObj = 0; + int notDirLnk = 0; + int objLoop = 0; + int lnkLoop = 0; + YCHAR *newname; + + if(!oldpath || !linkpath){ + yaffsfs_SetError(-EFAULT); + return -1; + } + + if(yaffsfs_CheckPath(linkpath) < 0 || + yaffsfs_CheckPath(oldpath) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,oldpath,0,1); - target = yaffsfs_FindObject(NULL,newpath,0,0); + obj = yaffsfs_FindObject(NULL,oldpath,0,1,&obj_dir,¬DirObj,&objLoop); + lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL,NULL,NULL); + lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0,¬DirLnk,&lnkLoop); - if(!obj) { + if((!obj_dir && notDirObj) || (!lnk_dir && notDirLnk)) + yaffsfs_SetError(-ENOTDIR); + else if(objLoop || lnkLoop) + yaffsfs_SetError(-ELOOP); + else if(!obj_dir || !lnk_dir || !obj) yaffsfs_SetError(-ENOENT); - retVal = -1; - } else if(obj->my_dev->read_only){ - yaffsfs_SetError(-EINVAL); - retVal= -1; - } else if(target) { + 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); - retVal = -1; - } else { - struct yaffs_obj *newdir = NULL; - struct yaffs_obj *link = NULL; - - YCHAR *newname; - - newdir = yaffsfs_FindDirectory(NULL,newpath,&newname,0); - - if(!newdir){ - yaffsfs_SetError(-ENOTDIR); - retVal = -1; - }else if(newdir->my_dev != obj->my_dev){ - yaffsfs_SetError(-EXDEV); - retVal = -1; - } - + else if(lnk_dir->my_dev != obj->my_dev) + yaffsfs_SetError(-EXDEV); + else { retVal = yaffsfs_CheckNameLength(newname); - + if(retVal == 0) { - link = yaffs_link_obj(newdir,newname,obj); - if(link) + lnk = yaffs_link_obj(lnk_dir,newname,obj); + if(lnk) retVal = 0; else{ yaffsfs_SetError(-ENOSPC); retVal = -1; } - } } yaffsfs_Unlock(); @@ -2352,10 +3131,18 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath) int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev) { + pathname=pathname; + mode=mode; + dev=dev; + + yaffsfs_SetError(-EINVAL); return -1; } +/* + * D E B U G F U N C T I O N S + */ /* * yaffs_n_handles() @@ -2365,9 +3152,22 @@ int yaffs_n_handles(const YCHAR *path) { struct yaffs_obj *obj; - obj = yaffsfs_FindObject(NULL,path,0,1); + if(!path){ + yaffsfs_SetError(-EFAULT); + return -1; + } - return yaffsfs_CountHandles(obj); + if(yaffsfs_CheckPath(path) < 0){ + yaffsfs_SetError(-ENAMETOOLONG); + return -1; + } + + obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL,NULL); + + if(obj) + return yaffsfs_CountHandles(obj); + else + return -1; } int yaffs_get_error(void) @@ -2377,14 +3177,15 @@ int yaffs_get_error(void) int yaffs_set_error(int error) { - /*yaffsfs_SetError does not return. So the program is assumed to have worked. */ yaffsfs_SetError(error); return 0; } int yaffs_dump_dev(const YCHAR *path) { -#if 0 +#if 1 + path=path; +#else YCHAR *rest; struct yaffs_obj *obj = yaffsfs_FindRoot(path,&rest);