i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revised my previous patch as outlined in the previous one:

Browse Source 
* No longer checks for the path delimiter twice.
* Now also checks if the first part of the path is a directory.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24722 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-04-01 17:59:51 +00:00
parent 6800e4f8ba
commit b987779d7f
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/vfs.cpp
+17 -10
View File
@@ -1753,7 +1753,7 @@ vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
int count, struct io_context *ioContext, struct vnode **_vnode,
ino_t *_parentID, int *_type)
{
status_t status = 0;
status_t status = B_OK;
ino_t lastParentID = vnode->id;
int type = 0;
@@ -1782,7 +1782,8 @@ vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
// walk to find the next path component ("path" will point to a single
// path component), and filter out multiple slashes
for (nextPath = path + 1; *nextPath != '\0' && *nextPath != '/'; nextPath++);
for (nextPath = path + 1; *nextPath != '\0' && *nextPath != '/';
nextPath++);
if (*nextPath == '/') {
*nextPath = '\0';
@@ -1806,12 +1807,25 @@ vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
put_vnode(vnode);
vnode = nextVnode;
}
} else if (nextPath[0]) {
// check if vnode is really a directory
if (type == 0) {
// we need to retrieve the type first
struct stat stat;
status = FS_CALL(vnode, read_stat)(vnode->mount->cookie,
vnode->private_node, &stat);
if (status == B_OK)
type = stat.st_mode;
}
if (status == B_OK && !S_ISDIR(type))
status = B_NOT_A_DIRECTORY;
}
// Check if we have the right to search the current directory vnode.
// If a file system doesn't have the access() function, we assume that
// searching a directory is always allowed
if (FS_CALL(vnode, access))
if (status == B_OK && FS_CALL(vnode, access))
status = FS_CALL(vnode, access)(vnode->mount->cookie, vnode->private_node, X_OK);
// Tell the filesystem to get the vnode of this path component (if we got the
@@ -1929,13 +1943,6 @@ vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
path = nextPath;
vnode = nextVnode;
if (strchr(path, '/') && !S_ISDIR(type)) {
// We need to continue to traverse, but our next vnode is not
// a directory.
put_vnode(vnode);
return B_NOT_A_DIRECTORY;
}
// see if we hit a mount point
struct vnode *mountPoint = resolve_mount_point_to_volume_root(vnode);
if (mountPoint) {