X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fdir.c;h=43cc0b53a623dcd1624e112fc60ff474c6cdbb28;hb=3764c294f21229bdf700f436fa4884f5e76e0d3a;hp=52e9f8075724956d47e5386ddacc71d9729c5018;hpb=77ed20ce9d7e25654215980d0f89e63b8dd366f0;p=tpg%2Facess2.git diff --git a/Kernel/vfs/dir.c b/Kernel/vfs/dir.c index 52e9f807..43cc0b53 100644 --- a/Kernel/vfs/dir.c +++ b/Kernel/vfs/dir.c @@ -3,7 +3,7 @@ * - Directory Management Functions */ #define DEBUG 0 -#include +#include #include #include @@ -11,8 +11,10 @@ extern tVFS_Mount *gRootMount; // === PROTOTYPES === - int VFS_MkDir(char *Path); - int VFS_MkNod(char *Path, Uint Flags); +#if 0 + int VFS_MkDir(const char *Path); +#endif + int VFS_MkNod(const char *Path, Uint Flags); // === CODE === /** @@ -20,7 +22,7 @@ extern tVFS_Mount *gRootMount; * \brief Create a new node * \param Path Path of directory to create */ -int VFS_MkDir(char *Path) +int VFS_MkDir(const char *Path) { return VFS_MkNod(Path, VFS_FFLAG_DIRECTORY); } @@ -31,7 +33,7 @@ int VFS_MkDir(char *Path) * \param Path Path of new node * \param Flags Flags to apply to the node */ -int VFS_MkNod(char *Path, Uint Flags) +int VFS_MkNod(const char *Path, Uint Flags) { char *absPath, *name; int pos = 0, oldpos = 0; @@ -61,7 +63,12 @@ int VFS_MkNod(char *Path, Uint Flags) else parent = VFS_ParsePath(absPath, NULL); - if(!parent) return -1; // Error Check + LOG("parent = %p", parent); + + if(!parent) { + LEAVE('i', -1); + return -1; // Error Check + } // Permissions Check if( !VFS_CheckACL(parent, VFS_PERM_EXECUTE|VFS_PERM_WRITE) ) { @@ -99,29 +106,31 @@ int VFS_MkNod(char *Path, Uint Flags) } /** - * \fn int VFS_Symlink(char *Name, char *Link) + * \fn int VFS_Symlink(const char *Name, const char *Link) * \brief Creates a symlink called \a Name to \a Link * \param Name Name of symbolic link * \param Link Destination of symbolic link */ -int VFS_Symlink(char *Name, char *Link) +int VFS_Symlink(const char *Name, const char *Link) { char *realLink; int fp; tVFS_Node *destNode; + char *_link; //ENTER("sName sLink", Name, Link); // Get absolue path name - Link = VFS_GetAbsPath( Link ); - if(!Link) { + _link = VFS_GetAbsPath( Link ); + if(!_link) { Warning("Path '%s' is badly formed", Link); return -1; } // Get true path and node - destNode = VFS_ParsePath( Link, &realLink ); - free(Link); + destNode = VFS_ParsePath( _link, &realLink ); + free(_link); + _link = NULL; // Check if destination exists if(!destNode) {