X-Git-Url: http://aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=05cd22977720acd42e1bc925f9fc119e05a81584;hp=69cf0a48ad9e424d7fc53890683cc1af61682e87;hb=bfde38bff96a421dcb73ffbb8b9b69f3f6500677;hpb=efeb8cffeda1302c3ab0c36b1c91e09ffd417f4a diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index 69cf0a4..05cd229 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -515,17 +515,17 @@ static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, thisMatchLength = 0; matching = 1; + if(!p) continue; - while (matching && *p && *leftOver) { - /* Skip over any /s */ - while (yaffsfs_IsPathDivider(*p)) - p++; + /* Skip over any leading /s */ + while (yaffsfs_IsPathDivider(*p)) + p++; + while (yaffsfs_IsPathDivider(*leftOver)) + leftOver++; - /* Skip over any /s */ - while (yaffsfs_IsPathDivider(*leftOver)) - leftOver++; + while (matching && *p && *leftOver) { /* Now match the text part */ while (matching && @@ -539,6 +539,16 @@ static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, matching = 0; } } + + if ((*p && !yaffsfs_IsPathDivider(*p)) || + (*leftOver && !yaffsfs_IsPathDivider(*leftOver))) + matching = 0; + else { + while (yaffsfs_IsPathDivider(*p)) + p++; + while (yaffsfs_IsPathDivider(*leftOver)) + leftOver++; + } } /* Skip over any /s in leftOver */ @@ -559,7 +569,6 @@ static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, retval = dev; longestMatch = thisMatchLength; } - } return retval; } @@ -738,7 +747,20 @@ static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relDir, if (dirOut) *dirOut = dir; - if (dir && *name) + /* At this stage we have looked up directory part and have the name part + * in name if there is one. + * + * eg /nand/x/ will give us a name of "" + * /nand/x will give us a name of "x" + * + * Since the name part might be "." or ".." which need to be fixed. + */ + if (dir && (yaffs_strcmp(name, _Y("..")) == 0)) { + dir = dir->parent; + obj = dir; + } else if (dir && (yaffs_strcmp(name, _Y(".")) == 0)) + obj = dir; + else if (dir && *name) obj = yaffs_find_by_name(dir, name); else obj = dir; @@ -831,7 +853,7 @@ int yaffs_open_sharing_reldir(struct yaffs_obj *reldir, const YCHAR *path, oflag &= ~(O_EXCL); /* O_TRUNC has no meaning if (O_CREAT | O_EXCL) is specified */ - if ((oflag & O_CREAT) & (oflag & O_EXCL)) + if ((oflag & O_CREAT) && (oflag & O_EXCL)) oflag &= ~(O_TRUNC); /* Todo: Are there any more flag combos to sanitise ? */ @@ -897,10 +919,10 @@ int yaffs_open_sharing_reldir(struct yaffs_obj *reldir, const YCHAR *path, } /* Check file permissions */ - if (readRequested && !(obj->yst_mode & S_IREAD)) + if (readRequested && !(obj->yst_mode & S_IRUSR)) openDenied = 1; - if (writeRequested && !(obj->yst_mode & S_IWRITE)) + if (writeRequested && !(obj->yst_mode & S_IWUSR)) openDenied = 1; if (!errorReported && writeRequested && @@ -1567,6 +1589,35 @@ int yaffs_unlink(const YCHAR *path) return yaffs_unlink_reldir(NULL, path); } +int yaffs_funlink(int fd) +{ + struct yaffs_obj *obj; + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_HandleToObject(fd); + + if (!obj) + yaffsfs_SetError(-EBADF); + else if (obj->my_dev->read_only) + yaffsfs_SetError(-EROFS); + else if (!isDirectory && + obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) + yaffsfs_SetError(-EISDIR); + else if (isDirectory && + obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) + yaffsfs_SetError(-ENOTDIR); + else if (isDirectory && obj == obj->my_dev->root_dir) + yaffsfs_SetError(-EBUSY); /* Can't rmdir a root */ + else if (yaffs_unlink_obj(oobj) == YAFFS_OK) + retVal = 0; + + yaffsfs_Unlock(); + + return retVal; +} + + static int rename_file_over_dir(struct yaffs_obj *obj, struct yaffs_obj *newobj) { if (obj && obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY && @@ -2531,11 +2582,11 @@ int yaffs_access_reldir(struct yaffs_obj *reldir, const YCHAR *path, int amode) else { int access_ok = 1; - if ((amode & R_OK) && !(obj->yst_mode & S_IREAD)) + if ((amode & R_OK) && !(obj->yst_mode & S_IRUSR)) access_ok = 0; - if ((amode & W_OK) && !(obj->yst_mode & S_IWRITE)) + if ((amode & W_OK) && !(obj->yst_mode & S_IWUSR)) access_ok = 0; - if ((amode & X_OK) && !(obj->yst_mode & S_IEXEC)) + if ((amode & X_OK) && !(obj->yst_mode & S_IXUSR)) access_ok = 0; if (!access_ok) @@ -2841,7 +2892,9 @@ int yaffs_mount(const YCHAR *path) return yaffs_mount_common(NULL, path, 0, 0); } -int yaffs_sync_common(struct yaffs_dev *dev, const YCHAR *path) +static int yaffs_sync_common(struct yaffs_dev *dev, + const YCHAR *path, + int do_checkpt) { int retVal = -1; YCHAR *dummy; @@ -2870,7 +2923,8 @@ int yaffs_sync_common(struct yaffs_dev *dev, const YCHAR *path) else { yaffs_flush_whole_cache(dev, 0); - yaffs_checkpoint_save(dev); + if (do_checkpt) + yaffs_checkpoint_save(dev); retVal = 0; } @@ -2881,14 +2935,24 @@ int yaffs_sync_common(struct yaffs_dev *dev, const YCHAR *path) return retVal; } +int yaffs_sync_files_reldev(struct yaffs_dev *dev) +{ + return yaffs_sync_common(dev, NULL, 0); +} + +int yaffs_sync_files(const YCHAR *path) +{ + return yaffs_sync_common(NULL, path, 0); +} + int yaffs_sync_reldev(struct yaffs_dev *dev) { - return yaffs_sync_common(dev, NULL); + return yaffs_sync_common(dev, NULL, 1); } int yaffs_sync(const YCHAR *path) { - return yaffs_sync_common(NULL, path); + return yaffs_sync_common(NULL, path, 1); } @@ -3419,6 +3483,7 @@ static yaffs_DIR *yaffsfs_opendir_reldir_no_lock(struct yaffs_obj *reldir, } obj = yaffsfs_FindObject(reldir, dirname, 0, 1, NULL, ¬Dir, &loop); + obj = yaffsfs_FollowLink(obj, 0, &loop); if (!obj && notDir) yaffsfs_SetError(-ENOTDIR); @@ -3578,6 +3643,7 @@ static int yaffsfs_closedir_no_lock(yaffs_DIR *dirp) return 0; } + int yaffs_closedir(yaffs_DIR *dirp) { int ret; @@ -3824,6 +3890,11 @@ int yaffs_set_error(int error) return 0; } +struct yaffs_obj * yaffs_get_obj_from_fd(int handle) +{ + return yaffsfs_HandleToObject(handle); +} + int yaffs_dump_dev_reldir(struct yaffs_obj *reldir, const YCHAR *path) { #if 1