ENOTDIR was being returned if a directory part of the path was not found.
This should return ENOENT.
ENOTDIR should be returned if an item in a path that should be a directory is
actually something else (eg. a file).
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
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 **dirOut,
+ int *notDir);
static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
if(yaffsfs_IsPathDivider(*alias))
/* Starts with a /, need to scan from root up */
if(yaffsfs_IsPathDivider(*alias))
/* Starts with a /, need to scan from root up */
- obj = yaffsfs_FindObject(NULL,alias,symDepth++,1,NULL);
+ obj = yaffsfs_FindObject(NULL,alias,symDepth++,1,NULL,NULL);
else
/* Relative to here, so use the parent of the symlink as a start */
else
/* Relative to here, so use the parent of the symlink as a start */
- obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1,NULL);
+ obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1,NULL,NULL);
* eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx"
*/
static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir,
* 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)
{
struct yaffs_obj *dir;
YCHAR *restOfPath;
YCHAR str[YAFFS_MAX_NAME_LENGTH+1];
int i;
{
struct yaffs_obj *dir;
YCHAR *restOfPath;
YCHAR str[YAFFS_MAX_NAME_LENGTH+1];
int i;
+ if(notDir)
+ *notDir = 0;
+
if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES)
return NULL;
if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES)
return NULL;
else
dir = yaffsfs_FindRoot(path,&restOfPath);
else
dir = yaffsfs_FindRoot(path,&restOfPath);
while(dir){
/*
* parse off /.
while(dir){
/*
* parse off /.
dir = yaffsfs_FollowLink(dir,symDepth);
dir = yaffsfs_FollowLink(dir,symDepth);
- if(dir && dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+ if(dir && dir->variant_type !=
+ YAFFS_OBJECT_TYPE_DIRECTORY){
+ if(notDir)
+ *notDir = 1;
-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 *relDirectory,
+ const YCHAR *path,
+ YCHAR **name,
+ int symDepth,
+ int *notDir)
- return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth);
+ return yaffsfs_DoFindDirectory(relDirectory,path,name,symDepth,notDir);
*/
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 **dirOut, int *notDir)
{
struct yaffs_obj *dir;
struct yaffs_obj *obj;
YCHAR *name;
{
struct yaffs_obj *dir;
struct yaffs_obj *obj;
YCHAR *name;
- dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
+ dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth,notDir);
if(dirOut)
*dirOut = dir;
if(dirOut)
*dirOut = dir;
yh = yaffsfs_GetHandlePointer(handle);
/* try to find the exisiting object */
yh = yaffsfs_GetHandlePointer(handle);
/* try to find the exisiting object */
- obj = yaffsfs_FindObject(NULL,path,0,1,NULL);
+ obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL);
obj = yaffsfs_FollowLink(obj,symDepth++);
obj = yaffsfs_FollowLink(obj,symDepth++);
* the directory exists. If not, error.
*/
if(!obj && !errorReported){
* the directory exists. If not, error.
*/
if(!obj && !errorReported){
- dir = yaffsfs_FindDirectory(NULL,path,&name,0);
+ dir = yaffsfs_FindDirectory(NULL,path,&name,0,NULL);
if(!dir){
yaffsfs_SetError(-ENOTDIR);
errorReported = 1;
if(!dir){
yaffsfs_SetError(-ENOTDIR);
errorReported = 1;
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
int result = YAFFS_FAIL;
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
int result = YAFFS_FAIL;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
yaffsfs_SetError(-EISDIR);
yaffsfs_SetError(-ENOENT);
else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
yaffsfs_SetError(-EISDIR);
struct yaffs_obj *obj = NULL;
YCHAR *name;
int result = YAFFS_FAIL;
struct yaffs_obj *obj = NULL;
YCHAR *name;
int result = YAFFS_FAIL;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
- obj = yaffsfs_FindObject(NULL,path,0,0,NULL);
- dir = yaffsfs_FindDirectory(NULL,path,&name,0);
+ obj = yaffsfs_FindObject(NULL,path,0,0,NULL,NULL);
+ dir = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
YCHAR *newname;
int result= YAFFS_FAIL;
int rename_allowed = 1;
YCHAR *newname;
int result= YAFFS_FAIL;
int rename_allowed = 1;
+ int notOldDir;
+ int notNewDir;
- olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0);
- newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0);
- obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL);
+ olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0,¬OldDir);
+ newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0,¬NewDir);
+ obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL,NULL);
- if(!olddir || !newdir) {
+ if((!olddir && notOldDir) || (!newdir && notNewDir)) {
yaffsfs_SetError(-ENOTDIR);
rename_allowed = 0;
yaffsfs_SetError(-ENOTDIR);
rename_allowed = 0;
+ } else if(!olddir || !newdir || !obj) {
yaffsfs_SetError(-ENOENT);
rename_allowed = 0;
} else if(obj->my_dev->read_only){
yaffsfs_SetError(-ENOENT);
rename_allowed = 0;
} else if(obj->my_dev->read_only){
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
if(!doLStat && obj)
obj = yaffsfs_FollowLink(obj,0);
if(!doLStat && obj)
obj = yaffsfs_FollowLink(obj,0);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else
retVal = yaffsfs_DoStat(obj,buf);
yaffsfs_SetError(-ENOENT);
else
retVal = yaffsfs_DoStat(obj,buf);
{
struct yaffs_obj *obj;
struct yaffs_obj *dir;
{
struct yaffs_obj *obj;
struct yaffs_obj *dir;
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_set_xattrib(obj,name,data,size,flags);
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_set_xattrib(obj,name,data,size,flags);
{
struct yaffs_obj *obj;
struct yaffs_obj *dir;
{
struct yaffs_obj *obj;
struct yaffs_obj *dir;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_get_xattrib(obj,name,data,size);
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_get_xattrib(obj,name,data,size);
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
- obj = yaffsfs_FindObject(NULL,path,0,1,&dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1,&dir,¬Dir);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_list_xattrib(obj, data,size);
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_list_xattrib(obj, data,size);
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
int retVal = -1;
if(yaffsfs_CheckPath(path) < 0){
int retVal = -1;
if(yaffsfs_CheckPath(path) < 0){
- obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_remove_xattrib(obj,name);
yaffsfs_SetError(-ENOENT);
else {
retVal = yaffs_remove_xattrib(obj,name);
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
{
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
int retval = -1;
if(yaffsfs_CheckPath(path) < 0){
int retval = -1;
if(yaffsfs_CheckPath(path) < 0){
- obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else {
int access_ok = 1;
yaffsfs_SetError(-ENOENT);
else {
int access_ok = 1;
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
int retVal = -1;
struct yaffs_obj *obj=NULL;
struct yaffs_obj *dir=NULL;
int retVal = -1;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
- obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir, ¬Dir);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
yaffsfs_SetError(-EROFS);
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
yaffsfs_SetError(-EROFS);
YCHAR *name;
YCHAR *alt_path = NULL;
int retVal= -1;
YCHAR *name;
YCHAR *alt_path = NULL;
int retVal= -1;
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
if(yaffsfs_CheckPath(path) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
path = alt_path;
yaffsfs_Lock();
path = alt_path;
yaffsfs_Lock();
- parent = yaffsfs_FindDirectory(NULL,path,&name,0);
- if(!parent)
+ parent = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir);
+ if(!parent && notDir)
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
- else if(parent && yaffs_strnlen(name,5) == 0){
+ else if(!parent)
+ yaffsfs_SetError(-ENOENT);
+ else if(yaffs_strnlen(name,5) == 0){
/* Trying to make the root itself */
yaffsfs_SetError(-EEXIST);
/* Trying to make the root itself */
yaffsfs_SetError(-EEXIST);
- } else if(parent && parent->my_dev->read_only)
+ } else if(parent->my_dev->read_only)
yaffsfs_SetError(-EROFS);
else {
dir = yaffs_create_dir(parent,name,mode,0,0);
yaffsfs_SetError(-EROFS);
else {
dir = yaffs_create_dir(parent,name,mode,0,0);
yaffs_DIR *dir = NULL;
struct yaffs_obj *obj = NULL;
yaffsfs_DirectorySearchContext *dsc = NULL;
yaffs_DIR *dir = NULL;
struct yaffs_obj *obj = NULL;
yaffsfs_DirectorySearchContext *dsc = NULL;
if(yaffsfs_CheckPath(dirname) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
if(yaffsfs_CheckPath(dirname) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
- obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL);
+ obj = yaffsfs_FindObject(NULL,dirname,0,1,NULL,¬Dir);
- if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
+ if(!obj && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj)
+ yaffsfs_SetError(-ENOENT);
+ else if(obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+ yaffsfs_SetError(-ENOTDIR);
+ else {
dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext));
dir = (yaffs_DIR *)dsc;
dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext));
dir = (yaffs_DIR *)dsc;
YCHAR *name;
int retVal= -1;
int mode = 0; /* ignore for now */
YCHAR *name;
int retVal= -1;
int mode = 0; /* ignore for now */
if(yaffsfs_CheckPath(newpath) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
return -1;
}
yaffsfs_Lock();
if(yaffsfs_CheckPath(newpath) < 0){
yaffsfs_SetError(-ENAMETOOLONG);
return -1;
}
yaffsfs_Lock();
- parent = yaffsfs_FindDirectory(NULL,newpath,&name,0);
- if(!parent)
+ parent = yaffsfs_FindDirectory(NULL,newpath,&name,0,¬Dir);
+ if(!parent && notDir)
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
- else if( strlen(name) < 1)
+ else if( !parent || yaffs_strnlen(name,5) < 1)
yaffsfs_SetError(-ENOENT);
else if(parent->my_dev->read_only)
yaffsfs_SetError(-EROFS);
yaffsfs_SetError(-ENOENT);
else if(parent->my_dev->read_only)
yaffsfs_SetError(-EROFS);
obj = yaffs_create_symlink(parent,name,mode,0,0,oldpath);
if(obj)
retVal = 0;
obj = yaffs_create_symlink(parent,name,mode,0,0,oldpath);
if(obj)
retVal = 0;
- else if (yaffsfs_FindObject(NULL,newpath,0,0, NULL))
+ else if (yaffsfs_FindObject(NULL,newpath,0,0, NULL,NULL))
yaffsfs_SetError(-EEXIST);
else
yaffsfs_SetError(-ENOSPC);
yaffsfs_SetError(-EEXIST);
else
yaffsfs_SetError(-ENOSPC);
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
int retVal= -1;
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
int retVal= -1;
- obj = yaffsfs_FindObject(NULL,path,0,1, &dir);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOENT);
else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK)
yaffsfs_SetError(-EINVAL);
yaffsfs_SetError(-ENOENT);
else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK)
yaffsfs_SetError(-EINVAL);
struct yaffs_obj *obj_dir = NULL;
struct yaffs_obj *lnk_dir = NULL;
int retVal = -1;
struct yaffs_obj *obj_dir = NULL;
struct yaffs_obj *lnk_dir = NULL;
int retVal = -1;
+ int notDirObj;
+ int notDirLnk;
YCHAR *newname;
if(yaffsfs_CheckPath(linkpath) < 0){
YCHAR *newname;
if(yaffsfs_CheckPath(linkpath) < 0){
- obj = yaffsfs_FindObject(NULL,oldpath,0,1,&obj_dir);
- lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL);
- lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0);
+ obj = yaffsfs_FindObject(NULL,oldpath,0,1,&obj_dir,¬DirObj);
+ lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL,NULL);
+ lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0,¬DirLnk);
- if(!obj_dir || !lnk_dir)
+ if((!obj_dir && notDirObj) || (!lnk_dir && notDirLnk))
yaffsfs_SetError(-ENOTDIR);
yaffsfs_SetError(-ENOTDIR);
+ else if(!obj_dir || !lnk_dir || !obj)
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
yaffsfs_SetError(-ENOENT);
else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
- obj = yaffsfs_FindObject(NULL,path,0,1,NULL);
+ obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL);
if(obj)
return yaffsfs_CountHandles(obj);
if(obj)
return yaffsfs_CountHandles(obj);