#define YAFFSFS_RW_SIZE (1<<YAFFSFS_RW_SHIFT)
/* Some forward references */
-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,
+ int *notDir);
+
static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
unsigned int yaffs_wr_attempts;
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;
+ }
}
}
return 0;
}
+static void yaffsfs_BreakDeviceHandles(struct yaffs_dev *dev)
+{
+ yaffsfs_Handle *h;
+ struct yaffs_obj *obj;
+ int i;
+ for(i = 0; i < YAFFSFS_N_HANDLES; i++){
+ h = yaffsfs_GetHandlePointer(i);
+ obj = yaffsfs_GetHandleObject(i);
+ if(h && h->useCount>0 && obj && obj->my_dev == dev){
+ h->useCount = 0;
+ yaffsfs_PutInode(h->inodeId);
+ h->inodeId = -1;
+ }
+ }
+}
+
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 = 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 = YMALLOC(path_length + 1);
+ if(!alt_path)
+ return -1;
+ 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
*/
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)
{
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);
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);
}
return obj;
}
* 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;
+ if(notDir)
+ *notDir = 0;
+
if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES)
return NULL;
else
dir = yaffsfs_FindRoot(path,&restOfPath);
+
while(dir){
/*
* parse off /.
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;
dir = NULL;
+ }
+
}
}
}
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 *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);
}
/*
* 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, int *notDir)
{
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(dir && *name)
obj = yaffs_find_by_name(dir,name);
u8 readRequested;
u8 writeRequested;
+ if(yaffsfs_CheckPath(path) < 0){
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
+
/* O_EXCL only has meaning if O_CREAT is specified */
if(!(oflag & O_CREAT))
oflag &= ~(O_EXCL);
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,NULL);
obj = yaffsfs_FollowLink(obj,symDepth++);
* 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;
struct yaffs_obj *obj = NULL;
int pos = 0;
int startPos = 0;
+ int endPos = 0;
int nRead = 0;
int nToRead = 0;
int totalRead = 0;
/* 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;
yaffsfs_GetHandle(fd);
+ 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_GetHandleObject(fd);
+ if(!obj)
+ nRead = 0;
+ else
+ nRead = yaffs_file_rd(obj,buf,pos,nToRead);
if(nRead > 0){
totalRead += nRead;
if(!isPread) {
if(totalRead >= 0)
h->position = startPos + totalRead;
- else {
- /* todo error */
- }
+ else
+ yaffsfs_SetError(-EINVAL);
}
}
struct yaffs_obj *obj = NULL;
int pos = 0;
int startPos = 0;
+ int endPos;
int nWritten = 0;
int totalWritten = 0;
int write_trhrough = 0;
yaffsfs_GetHandle(fd);
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_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;
if(!isPwrite){
if(totalWritten > 0)
h->position = startPos + totalWritten;
- else {
- /* todo error */
- }
+ else
+ yaffsfs_SetError(-EINVAL);
}
}
int yaffs_truncate(const YCHAR *path,off_t new_size)
{
struct yaffs_obj *obj = NULL;
+ struct yaffs_obj *dir = NULL;
int result = YAFFS_FAIL;
+ int notDir;
+
+ 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);
- if(!obj)
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
yaffsfs_SetError(-EISDIR);
h = yaffsfs_GetHandlePointer(fd);
obj = yaffsfs_GetHandleObject(fd);
- if(!h || !obj){
- /* bad handle */
+ if(!h || !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;
pos = fSize + offset;
}
- if(pos >= 0)
+ if(pos >= 0 && pos <= YAFFS_MAX_FILE_SIZE)
h->position = pos;
- else
+ else{
yaffsfs_SetError(-EINVAL);
+ pos = -1;
+ }
}
yaffsfs_Unlock();
struct yaffs_obj *obj = NULL;
YCHAR *name;
int result = YAFFS_FAIL;
+ int notDir;
+
+ 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);
+ dir = yaffsfs_FindDirectory(NULL,path,&name,0,¬Dir);
+
+ if(!dir && notDir)
yaffsfs_SetError(-ENOTDIR);
+ 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(-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);
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);
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;
+ int notNewDir;
+ YCHAR *alt_newpath=NULL;
+
+ if(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);
+ newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0,¬NewDir);
+ obj = yaffsfs_FindObject(NULL,oldPath,0,0,NULL,NULL);
+ newobj = yaffsfs_FindObject(NULL,newPath,0,0,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 (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);
/*
* 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;
xx = xx->parent;
}
if(!rename_allowed)
- yaffsfs_SetError(-EACCES);
+ yaffsfs_SetError(-EINVAL);
}
if(rename_allowed)
yaffsfs_Unlock();
+ if(alt_newpath)
+ YFREE(alt_newpath);
+
return (result == YAFFS_FAIL) ? -1 : 0;
}
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;
+
+ 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);
if(!doLStat && obj)
obj = yaffsfs_FollowLink(obj,0);
- if(obj)
- retVal = yaffsfs_DoStat(obj,buf);
- else
- /* todo error not found */
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!dir || !obj)
yaffsfs_SetError(-ENOENT);
+ else
+ retVal = yaffsfs_DoStat(obj,buf);
yaffsfs_Unlock();
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;
int retVal = -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);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
- if(obj) {
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ 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();
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();
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;
+
+ 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);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
- if(obj) {
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ 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;
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;
+
+ 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);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
- if(obj) {
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ 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();
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;
int retVal = -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);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
- if(obj) {
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ 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();
int yaffs_access(const YCHAR *path, int amode)
{
- struct yaffs_obj *obj;
+ struct yaffs_obj *obj=NULL;
+ struct yaffs_obj *dir=NULL;
+ int notDir;
+ int retval = -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);
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir);
+ obj = yaffsfs_FollowLink(obj,0);
- if(obj) {
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!dir || !obj)
+ yaffsfs_SetError(-ENOENT);
+ else {
int access_ok = 1;
if((amode & R_OK) && !(obj->yst_mode & S_IREAD))
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();
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;
+
+ 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);
- if(!obj)
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ 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);
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);
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;
- /*
- * 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);
+ if(!parent && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!parent)
+ yaffsfs_SetError(-ENOENT);
+ 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)
+ YFREE(alt_path);
return retVal;
}
+int yaffs_rmdir(const YCHAR *path)
+{
+ int result;
+ YCHAR *alt_path;
+
+ 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)
+ YFREE(alt_path);
+ return result;
+}
+
+
void * yaffs_getdev(const YCHAR *path)
{
struct yaffs_dev *dev=NULL;
int retVal=-1;
int result=YAFFS_FAIL;
struct yaffs_dev *dev=NULL;
- YCHAR *restOfPath;
T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path));
+ if(yaffsfs_CheckPath(path) < 0){
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
+
yaffsfs_Lock();
yaffsfs_InitHandles();
- dev = yaffsfs_FindDevice(path,&restOfPath);
- if(dev && !(*restOfPath)){
+ dev = yaffsfs_FindMountPoint(path);
+ if(dev){
if(!dev->is_mounted){
dev->read_only = read_only ? 1 : 0;
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();
int retVal=-1;
struct yaffs_dev *dev=NULL;
YCHAR *dummy;
+
+ if(yaffsfs_CheckPath(path) < 0){
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
retVal = 0;
} else
- /* todo error - not mounted. */
yaffsfs_SetError(-EINVAL);
}else
- /* todo error - no device */
yaffsfs_SetError(-ENODEV);
yaffsfs_Unlock();
{
int retVal=-1;
struct yaffs_dev *dev=NULL;
- YCHAR *dummy;
+ yaffsfs_Handle *yh;
+
+ 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;
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 */
}
{
int retVal=-1;
struct yaffs_dev *dev=NULL;
- YCHAR *dummy;
+
+ 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;
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_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();
struct yaffs_dev *dev=NULL;
YCHAR *dummy;
+ if(yaffsfs_CheckPath(path) < 0){
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
+
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev && dev->is_mounted){
struct yaffs_dev *dev=NULL;
YCHAR *dummy;
+ 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;
struct yaffs_dev *dev=NULL;
YCHAR *dummy;
+ if(yaffsfs_CheckPath(path) < 0){
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
+
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev && dev->is_mounted) {
yaffs_DIR *dir = NULL;
struct yaffs_obj *obj = NULL;
yaffsfs_DirectorySearchContext *dsc = NULL;
+ int notDir;
+
+ 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);
- 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;
YCHAR *name;
int retVal= -1;
int mode = 0; /* ignore for now */
+ int notDir;
+ if(yaffsfs_CheckPath(newpath) < 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);
+ if(!parent && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ else if( !parent || yaffs_strnlen(name,5) < 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)
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))
+ yaffsfs_SetError(-EEXIST);
+ else
+ yaffsfs_SetError(-ENOSPC);
}
yaffsfs_Unlock();
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;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ obj = yaffsfs_FindObject(NULL,path,0,1, &dir,¬Dir);
- if(!obj) {
+ if(!dir && notDir)
+ yaffsfs_SetError(-ENOTDIR);
+ 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);
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;
+ int notDirLnk;
+ YCHAR *newname;
+
+ if(yaffsfs_CheckPath(linkpath) < 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);
+ lnk = yaffsfs_FindObject(NULL,linkpath,0,0,NULL,NULL);
+ lnk_dir = yaffsfs_FindDirectory(NULL,linkpath,&newname,0,¬DirLnk);
- if(!obj) {
+ if((!obj_dir && notDirObj) || (!lnk_dir && notDirLnk))
+ yaffsfs_SetError(-ENOTDIR);
+ else if(!obj_dir || !lnk_dir || !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 {
- 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();
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()
* Returns number of handles attached to the object
{
struct yaffs_obj *obj;
- obj = yaffsfs_FindObject(NULL,path,0,1);
+ if(yaffsfs_CheckPath(path) < 0){
+ yaffsfs_SetError(-ENAMETOOLONG);
+ return -1;
+ }
- return yaffsfs_CountHandles(obj);
+ obj = yaffsfs_FindObject(NULL,path,0,1,NULL,NULL);
+
+ if(obj)
+ return yaffsfs_CountHandles(obj);
+ else
+ return -1;
}
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);
projects / yaffs2.git / blobdiff