X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=8822cda25083a0ed51f8ad6449787fdaef93ea63;hp=3cd532e76d21867184076e5ac94a0e86529786d7;hb=24f00634ca4584100b60d7b68675c1c9c4646ee8;hpb=81ea50c07a64dc33f1c0556fdbd836e50b143625 diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index 3cd532e..8822cda 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -31,7 +31,11 @@ #define YAFFSFS_RW_SIZE (1<useCount>0 && + yaffsfs_inode[yh->inodeId].iObj->my_dev == dev) + yaffsfs_PutHandle(i); + } +} + /* - * Stuff to search for a directory from a path + * Stuff to handle names. */ @@ -300,14 +316,29 @@ int yaffsfs_IsPathDivider(YCHAR ch) return 0; } +int yaffsfs_CheckNameLength(const char *name) +{ + int retVal = 0; + int nameLength = yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH+1); + + if(nameLength == 0){ + yaffsfs_SetError(-ENOENT); + retVal = -1; + } else if (nameLength > YAFFS_MAX_NAME_LENGTH){ + yaffsfs_SetError(-ENAMETOOLONG); + retVal = -1; + } + + return retVal; +} 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 */ @@ -382,48 +413,16 @@ static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPat return retval; } -#if 0 -static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) +/* FindMountPoint only returns a dev entry if the path is a mount point */ +static struct yaffs_dev *yaffsfs_FindMountPoint(const YCHAR *path) { - yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList; - const YCHAR *leftOver; - const YCHAR *p; - struct yaffs_dev *retval = NULL; - int thisMatchLength; - int longestMatch = -1; - - /* - * Check all configs, choose the one that: - * 1) Actually matches a prefix (ie /a amd /abc will not match - * 2) Matches the longest. - */ - while(cfg && cfg->prefix && cfg->dev){ - leftOver = path; - p = cfg->prefix; - thisMatchLength = 0; - - while(*p && /* unmatched part of prefix */ - !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) && - *leftOver && yaffsfs_Match(*p,*leftOver)){ - p++; - leftOver++; - thisMatchLength++; - } - - - if((!*p || (yaffsfs_IsPathDivider(*p) && (p[1] == 0))) && /* end of prefix */ - (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && /* no more in this path name part */ - (thisMatchLength > longestMatch)){ - /* Matched prefix */ - *restOfPath = (YCHAR *)leftOver; - retval = cfg->dev; - longestMatch = thisMatchLength; - } - cfg++; - } - return retval; + struct yaffs_dev *dev; + YCHAR *restOfPath=NULL; + dev = yaffsfs_FindDevice(path,&restOfPath); + if(dev && restOfPath && *restOfPath) + dev = NULL; + return dev; } -#endif static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath) { @@ -448,10 +447,10 @@ 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); 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); } return obj; } @@ -535,7 +534,9 @@ static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relativeDirecto /* * 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 *relativeDirectory, + const YCHAR *path,int symDepth, int getEquiv, + struct yaffs_obj **dirOut) { struct yaffs_obj *dir; struct yaffs_obj *obj; @@ -543,6 +544,9 @@ static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory, dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth); + if(dirOut) + *dirOut = dir; + if(dir && *name) obj = yaffs_find_by_name(dir,name); else @@ -632,7 +636,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) yh = yaffsfs_GetHandlePointer(handle); /* try to find the exisiting object */ - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,NULL); obj = yaffsfs_FollowLink(obj,symDepth++); @@ -897,7 +901,16 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off 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_GetHandleObject(fd); + if(!obj) + nRead = 0; + else + nRead = yaffs_file_rd(obj,buf,pos,nToRead); if(nRead > 0){ totalRead += nRead; @@ -980,11 +993,21 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, yaffsfs_GetHandle(fd); pos = startPos; 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_GetHandleObject(fd); + 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; @@ -1037,24 +1060,28 @@ int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offse int yaffs_truncate(const YCHAR *path,off_t new_size) { struct yaffs_obj *obj = NULL; + struct yaffs_obj *dir = NULL; int result = YAFFS_FAIL; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir); - if(!obj) + if(!dir) + yaffsfs_SetError(-ENOTDIR); + else if(!obj) yaffsfs_SetError(-ENOENT); else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE) yaffsfs_SetError(-EISDIR); else if(obj->my_dev->read_only) + yaffsfs_SetError(-EACCES); + else if(new_size < 0 || new_size > YAFFS_MAX_FILE_SIZE) yaffsfs_SetError(-EINVAL); else result = yaffs_resize_file(obj,new_size); yaffsfs_Unlock(); - return (result) ? 0 : -1; } @@ -1072,13 +1099,14 @@ int yaffs_ftruncate(int fd, off_t new_size) /* bad handle */ yaffsfs_SetError(-EBADF); else if(obj->my_dev->read_only) + yaffsfs_SetError(-EACCES); + 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); yaffsfs_Unlock(); - return (result) ? 0 : -1; } @@ -1131,8 +1159,9 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,0); + obj = yaffsfs_FindObject(NULL,path,0,0,NULL); dir = yaffsfs_FindDirectory(NULL,path,&name,0); + if(!dir) yaffsfs_SetError(-ENOTDIR); else if(!obj) @@ -1158,11 +1187,6 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) } -int yaffs_rmdir(const YCHAR *path) -{ - return yaffsfs_DoUnlink(path,1); -} - int yaffs_unlink(const YCHAR *path) { return yaffsfs_DoUnlink(path,0); @@ -1182,18 +1206,19 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0); newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0); - obj = yaffsfs_FindObject(NULL,oldPath,0,0); + obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL); - if(!olddir || !newdir || !obj) { - /* bad file */ - yaffsfs_SetError(-EBADF); + if(!olddir || !newdir) { + yaffsfs_SetError(-ENOTDIR); + rename_allowed = 0; + } else if(!obj) { + yaffsfs_SetError(-ENOENT); rename_allowed = 0; } else if(obj->my_dev->read_only){ - yaffsfs_SetError(-EINVAL); + yaffsfs_SetError(-EROFS); rename_allowed = 0; } else if(olddir->my_dev != newdir->my_dev) { - /* oops must be on same device */ - /* todo error */ + /* Rename must be on same device */ yaffsfs_SetError(-EXDEV); rename_allowed = 0; } else if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) { @@ -1211,7 +1236,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) @@ -1267,22 +1292,24 @@ 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; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir); if(!doLStat && obj) obj = yaffsfs_FollowLink(obj,0); - if(obj) - retVal = yaffsfs_DoStat(obj,buf); - else - /* todo error not found */ + if(!dir) + yaffsfs_SetError(-ENOTDIR); + else if(!obj) yaffsfs_SetError(-ENOENT); + else + retVal = yaffsfs_DoStat(obj,buf); yaffsfs_Unlock(); @@ -1327,25 +1354,28 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf) 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 retVal = -1; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir); if(follow) obj = yaffsfs_FollowLink(obj,0); - if(obj) { + if(!dir) + yaffsfs_SetError(-ENOTDIR); + else if(!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(); @@ -1374,15 +1404,15 @@ int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int fl yaffsfs_Lock(); obj = yaffsfs_GetHandleObject(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(); @@ -1392,26 +1422,28 @@ 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; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir); if(follow) obj = yaffsfs_FollowLink(obj,0); - if(obj) { + if(!dir) + yaffsfs_SetError(-ENOTDIR); + else if(!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; @@ -1455,26 +1487,29 @@ 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; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,&dir); if(follow) obj = yaffsfs_FollowLink(obj,0); - if(obj) { + if(!dir) + yaffsfs_SetError(-ENOTDIR); + else if(!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(); @@ -1518,26 +1553,29 @@ 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 retVal = -1; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir); if(follow) obj = yaffsfs_FollowLink(obj,0); - if(obj) { + if(!dir) + yaffsfs_SetError(-ENOTDIR); + else if(!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(); @@ -1678,15 +1716,25 @@ 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 retval = 0; + int retval = -1; + + if(amode & ~(R_OK | W_OK | X_OK)){ + yaffsfs_SetError(-EINVAL); + return -1; + } yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir); - if(obj) { + if(!dir) + yaffsfs_SetError(-ENOTDIR); + else if(!obj) + yaffsfs_SetError(-ENOENT); + else { int access_ok = 1; if((amode & R_OK) && !(obj->yst_mode & S_IREAD)) @@ -1696,14 +1744,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(); @@ -1715,18 +1759,25 @@ 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; + 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); - if(!obj) + if(!dir) + yaffsfs_SetError(-ENOTDIR); + else if(!obj) yaffsfs_SetError(-ENOENT); else if(obj->my_dev->read_only) - yaffsfs_SetError(-EINVAL); + yaffsfs_SetError(-EROFS); else retVal = yaffsfs_DoChMod(obj,mode); @@ -1740,16 +1791,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); 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); @@ -1759,22 +1814,17 @@ int yaffs_fchmod(int fd, mode_t mode) } -int yaffs_mkdir(const YCHAR *path, mode_t mode) +static int yaffsfs_alt_dir_path(const YCHAR *path, YCHAR **ret_path) { - struct yaffs_obj *parent = NULL; - struct yaffs_obj *dir = NULL; - YCHAR *name; - YCHAR *use_path = NULL; - int path_length = 0; - int retVal= -1; + 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 = strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1); /* If the last character is a path divider, then we need to @@ -1785,18 +1835,33 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) */ if(path_length > 0 && yaffsfs_IsPathDivider(path[path_length-1])){ - use_path = YMALLOC(path_length + 1); - if(!use_path){ - yaffsfs_SetError(-ENOMEM); + alt_path = YMALLOC(path_length + 1); + if(!alt_path) return -1; - } - strcpy(use_path, path); + strcpy(alt_path, path); for(i = path_length-1; - i >= 0 && yaffsfs_IsPathDivider(use_path[i]); + i >= 0 && yaffsfs_IsPathDivider(alt_path[i]); i--) - use_path[i] = (YCHAR) 0; - path = use_path; + alt_path[i] = (YCHAR) 0; + } + *ret_path = alt_path; + return 0; +} + +int yaffs_mkdir(const YCHAR *path, mode_t mode) +{ + struct yaffs_obj *parent = NULL; + struct yaffs_obj *dir = NULL; + YCHAR *name; + YCHAR *alt_path = NULL; + int retVal= -1; + + 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); @@ -1823,12 +1888,30 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) yaffsfs_Unlock(); - if(use_path) - YFREE(use_path); + if(alt_path) + YFREE(alt_path); return retVal; } +int yaffs_rmdir(const YCHAR *path) +{ + int result; + YCHAR *alt_path; + + 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) + YFREE(alt_path); + return result; +} + + void * yaffs_getdev(const YCHAR *path) { struct yaffs_dev *dev=NULL; @@ -1842,15 +1925,14 @@ int yaffs_mount2(const YCHAR *path,int read_only) int retVal=-1; int result=YAFFS_FAIL; struct yaffs_dev *dev=NULL; - YCHAR *dummy; - T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path)); + T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path)); 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; @@ -1910,10 +1992,10 @@ int yaffs_remount(const YCHAR *path, int force, int read_only) { int retVal=-1; struct yaffs_dev *dev=NULL; - YCHAR *dummy; + yaffsfs_Handle *yh; yaffsfs_Lock(); - dev = yaffsfs_FindDevice(path,&dummy); + dev = yaffsfs_FindMountPoint(path); if(dev){ if(dev->is_mounted){ int i; @@ -1922,7 +2004,9 @@ int yaffs_remount(const YCHAR *path, int force, int read_only) 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) + yh = & yaffsfs_handle[i]; + if(yh->useCount>0 && + yaffsfs_inode[yh->inodeId].iObj->my_dev == dev) inUse = 1; /* the device is in use, can't unmount */ } @@ -1950,10 +2034,9 @@ int yaffs_unmount2(const YCHAR *path, int force) { int retVal=-1; struct yaffs_dev *dev=NULL; - YCHAR *dummy; yaffsfs_Lock(); - dev = yaffsfs_FindDevice(path,&dummy); + dev = yaffsfs_FindMountPoint(path); if(dev){ if(dev->is_mounted){ int i; @@ -1963,11 +2046,14 @@ int yaffs_unmount2(const YCHAR *path, int force) 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) + 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(inUse) + yaffsfs_PutDeviceHandles(dev); yaffs_deinitialise(dev); retVal = 0; @@ -1979,8 +2065,7 @@ int yaffs_unmount2(const YCHAR *path, int force) /* todo error - not mounted. */ yaffsfs_SetError(-EINVAL); - } - else + } else /* todo error - no device */ yaffsfs_SetError(-ENODEV); @@ -2171,7 +2256,7 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname) yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,dirname,0,1); + obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL); if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){ @@ -2270,8 +2355,12 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) yaffsfs_Lock(); parent = yaffsfs_FindDirectory(NULL,newpath,&name,0); - if(parent && parent->my_dev->read_only) - yaffsfs_SetError(-EINVAL); + if(!parent) + yaffsfs_SetError(-ENOTDIR); + else if( strlen(name) < 1) + yaffsfs_SetError(-ENOENT); + 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) @@ -2280,9 +2369,6 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) yaffsfs_SetError(-ENOSPC); /* just assume no space for now */ retVal = -1; } - } else { - yaffsfs_SetError(-EINVAL); - retVal = -1; } yaffsfs_Unlock(); @@ -2294,20 +2380,20 @@ 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; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1, &dir); - if(!obj) { + if(!dir) + yaffsfs_SetError(-ENOTDIR); + else if(!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); @@ -2317,54 +2403,38 @@ 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; - int new_nameLength = 0; - + struct yaffs_obj *lnk = NULL; + int retVal = -1; yaffsfs_Lock(); - obj = yaffsfs_FindObject(NULL,oldpath,0,1); - target = yaffsfs_FindObject(NULL,newpath,0,0); + obj = yaffsfs_FindObject(NULL,oldpath,0,1,NULL); + lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL); - if(!obj) { + if(!obj) yaffsfs_SetError(-ENOENT); - retVal = -1; - } else if(obj->my_dev->read_only){ + else if(obj->my_dev->read_only) yaffsfs_SetError(-EINVAL); - retVal= -1; - } else if(target) { + else if(lnk) yaffsfs_SetError(-EEXIST); - retVal = -1; - } else { + else { struct yaffs_obj *newdir = NULL; struct yaffs_obj *link = NULL; YCHAR *newname; - newdir = yaffsfs_FindDirectory(NULL,newpath,&newname,0); + newdir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0); - if(!newdir){ + if(!newdir) yaffsfs_SetError(-ENOTDIR); - retVal = -1; - }else if(newdir->my_dev != obj->my_dev){ + else if(newdir->my_dev != obj->my_dev) yaffsfs_SetError(-EXDEV); - retVal = -1; - } - new_nameLength = yaffs_strnlen(newname,YAFFS_MAX_NAME_LENGTH+1); - - if(new_nameLength == 0){ - yaffsfs_SetError(-ENOENT); - retVal = -1; - } else if (new_nameLength > YAFFS_MAX_NAME_LENGTH){ - yaffsfs_SetError(-ENAMETOOLONG); - retVal = -1; - } + retVal = yaffsfs_CheckNameLength(newname); if(retVal == 0) { link = yaffs_link_obj(newdir,newname,obj); @@ -2384,6 +2454,9 @@ 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; return -1; } @@ -2397,7 +2470,7 @@ int yaffs_n_handles(const YCHAR *path) { struct yaffs_obj *obj; - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,NULL); return yaffsfs_CountHandles(obj); } @@ -2416,7 +2489,9 @@ int yaffs_set_error(int error) int yaffs_dump_dev(const YCHAR *path) { -#if 0 +#if 1 + path=path; +#else YCHAR *rest; struct yaffs_obj *obj = yaffsfs_FindRoot(path,&rest);