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

* Explained under which circumstances vnode_path_to_vnode() will clobber the

Browse Source 
buffer of the provided "path" argument.
* Applied patch by Vasilis to fix some warnings when build on Linux (missing
  const on certain functions). We should probably fix the original
  {add|remove}_debugger_command() functions in Haiku as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24322 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-03-09 13:43:38 +00:00
parent a433b9febf
commit fa28330bbf
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/fs_shell/vfs.cpp
+12 -11
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2007, Axel Dörfler, [email protected].
* Copyright 2002-2008, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License.
*
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -1050,14 +1050,14 @@ entry_ref_to_vnode(fssh_mount_id mountID, fssh_vnode_id directoryID, const char
}
/** Returns the vnode for the relative path starting at the specified \a vnode.
* \a path must not be NULL.
* If it returns successfully, \a path contains the name of the last path
* component.
* Note, this reduces the ref_count of the starting \a vnode, no matter if
* it is successful or not!
*/
/*! Returns the vnode for the relative path starting at the specified \a vnode.
\a path must not be NULL.
If it returns successfully, \a path contains the name of the last path
component. This function clobbers the buffer pointed to by \a path only
if it does contain more than one component.
Note, this reduces the ref_count of the starting \a vnode, no matter if
it is successful or not!
*/
static fssh_status_t
vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
int count, struct vnode **_vnode, fssh_vnode_id *_parentID, int *_type)
@@ -3237,9 +3237,10 @@ fix_dirent(struct vnode *parent, struct fssh_dirent *entry)
inc_vnode_ref_count(parent);
// vnode_path_to_vnode() puts the node
// ".." is guaranteed to to be clobbered by this call
struct vnode *vnode;
fssh_status_t status = vnode_path_to_vnode(parent, "..", false, 0, &vnode,
NULL, NULL);
fssh_status_t status = vnode_path_to_vnode(parent, (char*)"..", false,
0, &vnode, NULL, NULL);
if (status == FSSH_B_OK) {
entry->d_dev = vnode->device;