X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=3745f6189011c60bd14e63b9184c8212f9b36351;hp=c7b5ed2c8b9f09d75b2ab1cce1ba70191be4b0fa;hb=a6b656e2ec808ffab1b5f46babcdc5f7b49b7a46;hpb=cf6888f05f691aa1a357e7e94f9bf7b98174bbc3 diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index c7b5ed2..3745f61 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -31,8 +31,12 @@ #define YAFFSFS_RW_SIZE (1<iObj; @@ -261,11 +277,23 @@ static int yaffsfs_PutHandle(int handle) return 0; } +static void yaffsfs_PutDeviceHandles(struct yaffs_dev *dev) +{ + yaffsfs_Handle *yh; + int i; + for(i = 0; i < YAFFSFS_N_HANDLES; i++){ + yh = & yaffsfs_handle[i]; + if(yh->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. */ @@ -288,24 +316,39 @@ 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; +} -YLIST_HEAD(yaffsfs_deviceList); +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 */ -static yaffs_dev_t *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) +static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) { - struct ylist_head *cfg; + struct list_head *cfg; const YCHAR *leftOver; const YCHAR *p; - yaffs_dev_t *retval = NULL; - yaffs_dev_t *dev = NULL; + struct yaffs_dev *retval = NULL; + struct yaffs_dev *dev = NULL; int thisMatchLength; int longestMatch = -1; int matching; @@ -315,8 +358,8 @@ static yaffs_dev_t *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) * 1) Actually matches a prefix (ie /a amd /abc will not match * 2) Matches the longest. */ - ylist_for_each(cfg, &yaffsfs_deviceList){ - dev = ylist_entry(cfg, yaffs_dev_t, dev_list); + list_for_each(cfg, &yaffsfs_deviceList){ + dev = list_entry(cfg, struct yaffs_dev, dev_list); leftOver = path; p = dev->param.name; thisMatchLength = 0; @@ -370,53 +413,21 @@ static yaffs_dev_t *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) return retval; } -#if 0 -static yaffs_dev_t *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; - yaffs_dev_t *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 yaffs_obj_t *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath) +static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath) { - yaffs_dev_t *dev; + struct yaffs_dev *dev; dev= yaffsfs_FindDevice(path,restOfPath); if(dev && dev->is_mounted){ @@ -425,7 +436,7 @@ static yaffs_obj_t *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath) return NULL; } -static yaffs_obj_t *yaffsfs_FollowLink(yaffs_obj_t *obj,int symDepth) +static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,int symDepth) { if(obj) @@ -436,10 +447,10 @@ static yaffs_obj_t *yaffsfs_FollowLink(yaffs_obj_t *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; } @@ -451,10 +462,10 @@ static yaffs_obj_t *yaffsfs_FollowLink(yaffs_obj_t *obj,int symDepth) * * eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx" */ -static yaffs_obj_t *yaffsfs_DoFindDirectory(yaffs_obj_t *startDir, +static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, const YCHAR *path, YCHAR **name, int symDepth) { - yaffs_obj_t *dir; + struct yaffs_obj *dir; YCHAR *restOfPath; YCHAR str[YAFFS_MAX_NAME_LENGTH+1]; int i; @@ -514,7 +525,7 @@ static yaffs_obj_t *yaffsfs_DoFindDirectory(yaffs_obj_t *startDir, return NULL; } -static yaffs_obj_t *yaffsfs_FindDirectory(yaffs_obj_t *relativeDirectory, +static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relativeDirectory, const YCHAR *path,YCHAR **name,int symDepth) { return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth); @@ -523,14 +534,19 @@ static yaffs_obj_t *yaffsfs_FindDirectory(yaffs_obj_t *relativeDirectory, /* * yaffsfs_FindObject turns a path for an existing object into the object */ -static yaffs_obj_t *yaffsfs_FindObject(yaffs_obj_t *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) { - yaffs_obj_t *dir; - yaffs_obj_t *obj; + struct yaffs_obj *dir; + struct yaffs_obj *obj; YCHAR *name; dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth); + if(dirOut) + *dirOut = dir; + if(dir && *name) obj = yaffs_find_by_name(dir,name); else @@ -575,8 +591,8 @@ int yaffs_dup(int fd) int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) { - yaffs_obj_t *obj = NULL; - yaffs_obj_t *dir = NULL; + struct yaffs_obj *obj = NULL; + struct yaffs_obj *dir = NULL; YCHAR *name; int handle = -1; yaffsfs_Handle *yh = NULL; @@ -620,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++); @@ -629,6 +645,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) obj = NULL; + if(obj){ /* The file already exists or it might be a directory */ @@ -643,7 +660,7 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) /* Open should fail if O_CREAT and O_EXCL are specified since * the file exists */ - if((oflag & O_EXCL) && (oflag & O_CREAT)){ + if(!errorReported && (oflag & O_EXCL) && (oflag & O_CREAT)){ openDenied = 1; yaffsfs_SetError(-EEXIST); errorReported = 1; @@ -656,8 +673,14 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) if( writeRequested && !(obj->yst_mode & S_IWRITE)) openDenied = 1; + if(openDenied && !errorReported ) { + /* Error if the file exists but permissions are refused. */ + yaffsfs_SetError(-EACCES); + errorReported = 1; + } + /* Check sharing of an existing object. */ - { + if(!openDenied){ yaffsfs_Handle *hx; int i; sharedReadAllowed = 1; @@ -692,20 +715,39 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) } } - } else if((oflag & O_CREAT)) { - /* Let's see if we can create this file */ + } + + /* If we could not open an existing object, then let's see if + * the directory exists. If not, error. + */ + if(!obj && !errorReported){ dir = yaffsfs_FindDirectory(NULL,path,&name,0); - if(dir && dir->my_dev->read_only){ + if(!dir){ + yaffsfs_SetError(-ENOTDIR); + 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); errorReported = 1; - } else if(dir) + } else obj = yaffs_create_file(dir,name,mode,0,0); - else { - yaffsfs_SetError(-ENOTDIR); + + if(!obj && !errorReported){ + yaffsfs_SetError(-ENOSPC); errorReported = 1; } } + if(!obj && dir && !errorReported && !(oflag & O_CREAT)) { + /* Error if the file does not exist and CREAT is not set. */ + yaffsfs_SetError(-ENOENT); + errorReported = 1; + } + if(obj && !openDenied) { int inodeId = yaffsfs_GetInodeIdForObject(obj); @@ -731,10 +773,8 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing) yaffs_resize_file(obj,0); } else { yaffsfs_PutHandle(handle); - if(!errorReported) { - yaffsfs_SetError(!obj ? -ENOSPC : -EACCES); - errorReported = 1; - } + if(!errorReported) + yaffsfs_SetError(0); /* Problem */ handle = -1; } } @@ -817,7 +857,7 @@ int yaffs_close(int fd) int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int offset) { yaffsfs_Handle *h = NULL; - yaffs_obj_t *obj = NULL; + struct yaffs_obj *obj = NULL; int pos = 0; int startPos = 0; int nRead = 0; @@ -861,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; @@ -913,7 +962,7 @@ int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset) int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, int offset) { yaffsfs_Handle *h = NULL; - yaffs_obj_t *obj = NULL; + struct yaffs_obj *obj = NULL; int pos = 0; int startPos = 0; int nWritten = 0; @@ -944,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; @@ -1000,32 +1059,36 @@ int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offse int yaffs_truncate(const YCHAR *path,off_t new_size) { - yaffs_obj_t *obj = NULL; + 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; } int yaffs_ftruncate(int fd, off_t new_size) { yaffsfs_Handle *h = NULL; - yaffs_obj_t *obj = NULL; + struct yaffs_obj *obj = NULL; int result = 0; yaffsfs_Lock(); @@ -1036,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; } @@ -1050,7 +1114,7 @@ int yaffs_ftruncate(int fd, off_t new_size) off_t yaffs_lseek(int fd, off_t offset, int whence) { yaffsfs_Handle *h = NULL; - yaffs_obj_t *obj = NULL; + struct yaffs_obj *obj = NULL; int pos = -1; int fSize = -1; @@ -1088,15 +1152,16 @@ off_t yaffs_lseek(int fd, off_t offset, int whence) int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) { - yaffs_obj_t *dir = NULL; - yaffs_obj_t *obj = NULL; + struct yaffs_obj *dir = NULL; + struct yaffs_obj *obj = NULL; YCHAR *name; int result = YAFFS_FAIL; 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) @@ -1122,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); @@ -1134,9 +1194,9 @@ int yaffs_unlink(const YCHAR *path) int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) { - yaffs_obj_t *olddir = NULL; - yaffs_obj_t *newdir = NULL; - yaffs_obj_t *obj = NULL; + struct yaffs_obj *olddir = NULL; + struct yaffs_obj *newdir = NULL; + struct yaffs_obj *obj = NULL; YCHAR *oldname; YCHAR *newname; int result= YAFFS_FAIL; @@ -1146,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) { @@ -1167,7 +1228,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) * Do this by tracing from the new directory back to the root, checking for obj */ - yaffs_obj_t *xx = newdir; + struct yaffs_obj *xx = newdir; while( rename_allowed && xx){ if(xx == obj) @@ -1175,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) @@ -1187,7 +1248,7 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) } -static int yaffsfs_DoStat(yaffs_obj_t *obj,struct yaffs_stat *buf) +static int yaffsfs_DoStat(struct yaffs_obj *obj,struct yaffs_stat *buf) { int retVal = -1; @@ -1231,22 +1292,24 @@ static int yaffsfs_DoStat(yaffs_obj_t *obj,struct yaffs_stat *buf) static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat) { - yaffs_obj_t *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(); @@ -1266,7 +1329,7 @@ int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf) int yaffs_fstat(int fd, struct yaffs_stat *buf) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; int retVal = -1; @@ -1290,26 +1353,29 @@ 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) { - yaffs_obj_t *obj; + 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(); @@ -1331,22 +1397,22 @@ int yaffs_lsetxattr(const YCHAR *path, const char *name, const void *data, int s int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int flags) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; int retVal = -1; 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(); @@ -1355,27 +1421,29 @@ 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) { - yaffs_obj_t *obj; + 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; @@ -1395,7 +1463,7 @@ int yaffs_lgetxattr(const YCHAR *path, const char *name, void *data, int size) int yaffs_fgetxattr(int fd, const char *name, void *data, int size) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; int retVal = -1; @@ -1419,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) { - yaffs_obj_t *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(); @@ -1458,7 +1529,7 @@ int yaffs_llistxattr(const YCHAR *path, char *data, int size) int yaffs_flistxattr(int fd, char *data, int size) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; int retVal = -1; @@ -1482,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) { - yaffs_obj_t *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(); @@ -1521,7 +1595,7 @@ int yaffs_lremovexattr(const YCHAR *path, const char *name) int yaffs_fremovexattr(int fd, const char *name) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; int retVal = -1; @@ -1547,7 +1621,7 @@ int yaffs_fremovexattr(int fd, const char *name) #ifdef CONFIG_YAFFS_WINCE int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; int retVal = -1; @@ -1586,7 +1660,7 @@ int yaffs_set_wince_times(int fd, const unsigned *watime, const unsigned *wmtime) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; int result; int retVal = -1; @@ -1623,7 +1697,7 @@ int yaffs_set_wince_times(int fd, #endif -static int yaffsfs_DoChMod(yaffs_obj_t *obj,mode_t mode) +static int yaffsfs_DoChMod(struct yaffs_obj *obj,mode_t mode) { int result = -1; @@ -1642,15 +1716,25 @@ static int yaffsfs_DoChMod(yaffs_obj_t *obj,mode_t mode) int yaffs_access(const YCHAR *path, int amode) { - yaffs_obj_t *obj; + struct yaffs_obj *obj=NULL; + struct yaffs_obj *dir=NULL; + + int retval = -1; - int retval = 0; + 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)) @@ -1660,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(); @@ -1679,18 +1759,25 @@ int yaffs_access(const YCHAR *path, int amode) int yaffs_chmod(const YCHAR *path, mode_t mode) { - yaffs_obj_t *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); @@ -1703,17 +1790,21 @@ int yaffs_chmod(const YCHAR *path, mode_t mode) int yaffs_fchmod(int fd, mode_t mode) { - yaffs_obj_t *obj; - + 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); @@ -1723,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) { - yaffs_obj_t *parent = NULL; - yaffs_obj_t *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 @@ -1749,53 +1835,82 @@ 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); - if(parent && yaffs_strnlen(name,5) == 0){ + if(!parent) + yaffsfs_SetError(-ENOTDIR); + else if(parent && 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 && 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) + 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) { - yaffs_dev_t *dev=NULL; + struct yaffs_dev *dev=NULL; YCHAR *dummy; dev = yaffsfs_FindDevice(path,&dummy); return (void *)dev; @@ -1805,16 +1920,15 @@ int yaffs_mount2(const YCHAR *path,int read_only) { int retVal=-1; int result=YAFFS_FAIL; - yaffs_dev_t *dev=NULL; - YCHAR *dummy; + struct yaffs_dev *dev=NULL; - 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; @@ -1845,7 +1959,7 @@ int yaffs_mount(const YCHAR *path) int yaffs_sync(const YCHAR *path) { int retVal=-1; - yaffs_dev_t *dev=NULL; + struct yaffs_dev *dev=NULL; YCHAR *dummy; yaffsfs_Lock(); @@ -1873,11 +1987,11 @@ int yaffs_sync(const YCHAR *path) int yaffs_remount(const YCHAR *path, int force, int read_only) { int retVal=-1; - yaffs_dev_t *dev=NULL; - YCHAR *dummy; + struct yaffs_dev *dev=NULL; + yaffsfs_Handle *yh; yaffsfs_Lock(); - dev = yaffsfs_FindDevice(path,&dummy); + dev = yaffsfs_FindMountPoint(path); if(dev){ if(dev->is_mounted){ int i; @@ -1886,7 +2000,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 */ } @@ -1913,11 +2029,10 @@ int yaffs_remount(const YCHAR *path, int force, int read_only) int yaffs_unmount2(const YCHAR *path, int force) { int retVal=-1; - yaffs_dev_t *dev=NULL; - YCHAR *dummy; + struct yaffs_dev *dev=NULL; yaffsfs_Lock(); - dev = yaffsfs_FindDevice(path,&dummy); + dev = yaffsfs_FindMountPoint(path); if(dev){ if(dev->is_mounted){ int i; @@ -1927,11 +2042,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; @@ -1943,8 +2061,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); @@ -1961,7 +2078,7 @@ int yaffs_unmount(const YCHAR *path) loff_t yaffs_freespace(const YCHAR *path) { loff_t retVal=-1; - yaffs_dev_t *dev=NULL; + struct yaffs_dev *dev=NULL; YCHAR *dummy; yaffsfs_Lock(); @@ -1980,7 +2097,7 @@ loff_t yaffs_freespace(const YCHAR *path) loff_t yaffs_totalspace(const YCHAR *path) { loff_t retVal=-1; - yaffs_dev_t *dev=NULL; + struct yaffs_dev *dev=NULL; YCHAR *dummy; yaffsfs_Lock(); @@ -2000,7 +2117,7 @@ loff_t yaffs_totalspace(const YCHAR *path) int yaffs_inodecount(const YCHAR *path) { loff_t retVal= -1; - yaffs_dev_t *dev=NULL; + struct yaffs_dev *dev=NULL; YCHAR *dummy; yaffsfs_Lock(); @@ -2019,20 +2136,20 @@ int yaffs_inodecount(const YCHAR *path) } -void yaffs_add_device(yaffs_dev_t *dev) +void yaffs_add_device(struct yaffs_dev *dev) { dev->is_mounted = 0; dev->param.remove_obj_fn = yaffsfs_RemoveObjectCallback; if(!dev->dev_list.next) - YINIT_LIST_HEAD(&dev->dev_list); + INIT_LIST_HEAD(&dev->dev_list); - ylist_add(&dev->dev_list,&yaffsfs_deviceList); + list_add(&dev->dev_list,&yaffsfs_deviceList); } -void yaffs_remove_device(yaffs_dev_t *dev) +void yaffs_remove_device(struct yaffs_dev *dev) { - ylist_del_init(&dev->dev_list); + list_del_init(&dev->dev_list); } @@ -2052,15 +2169,15 @@ typedef struct u32 magic; yaffs_dirent de; /* directory entry being used by this dsc */ YCHAR name[NAME_MAX+1]; /* name of directory being searched */ - yaffs_obj_t *dirObj; /* ptr to directory being searched */ - yaffs_obj_t *nextReturn; /* obj to be returned by next readddir */ + struct yaffs_obj *dirObj; /* ptr to directory being searched */ + struct yaffs_obj *nextReturn; /* obj to be returned by next readddir */ int offset; - struct ylist_head others; + struct list_head others; } yaffsfs_DirectorySearchContext; -static struct ylist_head search_contexts; +static struct list_head search_contexts; static void yaffsfs_SetDirRewound(yaffsfs_DirectorySearchContext *dsc) @@ -2071,11 +2188,11 @@ static void yaffsfs_SetDirRewound(yaffsfs_DirectorySearchContext *dsc) dsc->offset = 0; - if( ylist_empty(&dsc->dirObj->variant.dir_variant.children)) + if( list_empty(&dsc->dirObj->variant.dir_variant.children)) dsc->nextReturn = NULL; else - dsc->nextReturn = ylist_entry(dsc->dirObj->variant.dir_variant.children.next, - yaffs_obj_t,siblings); + dsc->nextReturn = list_entry(dsc->dirObj->variant.dir_variant.children.next, + struct yaffs_obj,siblings); } else { /* Hey someone isn't playing nice! */ } @@ -2088,25 +2205,25 @@ static void yaffsfs_DirAdvance(yaffsfs_DirectorySearchContext *dsc) dsc->dirObj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){ if( dsc->nextReturn == NULL || - ylist_empty(&dsc->dirObj->variant.dir_variant.children)) + list_empty(&dsc->dirObj->variant.dir_variant.children)) dsc->nextReturn = NULL; else { - struct ylist_head *next = dsc->nextReturn->siblings.next; + struct list_head *next = dsc->nextReturn->siblings.next; if( next == &dsc->dirObj->variant.dir_variant.children) dsc->nextReturn = NULL; /* end of list */ else - dsc->nextReturn = ylist_entry(next,yaffs_obj_t,siblings); + dsc->nextReturn = list_entry(next,struct yaffs_obj,siblings); } } else { /* Hey someone isn't playing nice! */ } } -static void yaffsfs_RemoveObjectCallback(yaffs_obj_t *obj) +static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj) { - struct ylist_head *i; + struct list_head *i; yaffsfs_DirectorySearchContext *dsc; /* if search contexts not initilised then skip */ @@ -2117,9 +2234,9 @@ static void yaffsfs_RemoveObjectCallback(yaffs_obj_t *obj) * If any are the one being removed, then advance the dsc to * the next one to prevent a hanging ptr. */ - ylist_for_each(i, &search_contexts) { + list_for_each(i, &search_contexts) { if (i) { - dsc = ylist_entry(i, yaffsfs_DirectorySearchContext,others); + dsc = list_entry(i, yaffsfs_DirectorySearchContext,others); if(dsc->nextReturn == obj) yaffsfs_DirAdvance(dsc); } @@ -2130,12 +2247,12 @@ static void yaffsfs_RemoveObjectCallback(yaffs_obj_t *obj) yaffs_DIR *yaffs_opendir(const YCHAR *dirname) { yaffs_DIR *dir = NULL; - yaffs_obj_t *obj = NULL; + struct yaffs_obj *obj = NULL; yaffsfs_DirectorySearchContext *dsc = NULL; 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){ @@ -2147,12 +2264,12 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname) dsc->magic = YAFFS_MAGIC; dsc->dirObj = obj; yaffs_strncpy(dsc->name,dirname,NAME_MAX); - YINIT_LIST_HEAD(&dsc->others); + INIT_LIST_HEAD(&dsc->others); if(!search_contexts.next) - YINIT_LIST_HEAD(&search_contexts); + INIT_LIST_HEAD(&search_contexts); - ylist_add(&dsc->others,&search_contexts); + list_add(&dsc->others,&search_contexts); yaffsfs_SetDirRewound(dsc); } @@ -2215,7 +2332,7 @@ int yaffs_closedir(yaffs_DIR *dirp) yaffsfs_Lock(); dsc->magic = 0; - ylist_del(&dsc->others); /* unhook from list */ + list_del(&dsc->others); /* unhook from list */ YFREE(dsc); yaffsfs_Unlock(); return 0; @@ -2226,16 +2343,20 @@ int yaffs_closedir(yaffs_DIR *dirp) int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) { - yaffs_obj_t *parent = NULL; - yaffs_obj_t *obj; + struct yaffs_obj *parent = NULL; + struct yaffs_obj *obj; YCHAR *name; int retVal= -1; int mode = 0; /* ignore for now */ 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) @@ -2244,9 +2365,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(); @@ -2257,21 +2375,21 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz) { - yaffs_obj_t *obj = NULL; - int retVal; - + 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(!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); @@ -2281,54 +2399,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 */ - yaffs_obj_t *obj = NULL; - yaffs_obj_t *target = NULL; - int retVal = 0; - int new_nameLength = 0; - + struct yaffs_obj *obj = NULL; + 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 { - yaffs_obj_t *newdir = NULL; - yaffs_obj_t *link = NULL; + 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); @@ -2348,6 +2450,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; } @@ -2359,9 +2464,9 @@ int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev) */ int yaffs_n_handles(const YCHAR *path) { - yaffs_obj_t *obj; + struct yaffs_obj *obj; - obj = yaffsfs_FindObject(NULL,path,0,1); + obj = yaffsfs_FindObject(NULL,path,0,1,NULL); return yaffsfs_CountHandles(obj); } @@ -2371,15 +2476,24 @@ int yaffs_get_error(void) return yaffsfs_GetLastError(); } +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; - yaffs_obj_t *obj = yaffsfs_FindRoot(path,&rest); + struct yaffs_obj *obj = yaffsfs_FindRoot(path,&rest); if(obj){ - yaffs_dev_t *dev = obj->my_dev; + struct yaffs_dev *dev = obj->my_dev; printf("\n" "n_page_writes.......... %d\n"