git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel/x86_64 - Unbroke user stack creation
[tpg/acess2.git]
/
Kernel
/
vfs
/
dir.c
diff --git
a/Kernel/vfs/dir.c
b/Kernel/vfs/dir.c
index
57c11c1
..
8cc3fa8
100644
(file)
--- a/
Kernel/vfs/dir.c
+++ b/
Kernel/vfs/dir.c
@@
-1,14
+1,20
@@
/*
/*
+ * Acess2 VFS
+ * - Directory Management Functions
*/
*/
-#include "vfs.h"
-#include "vfs_int.h"
+#define DEBUG 0
+#include <acess.h>
+#include <vfs.h>
+#include <vfs_int.h>
// === IMPORTS ===
extern tVFS_Mount *gRootMount;
// === PROTOTYPES ===
// === IMPORTS ===
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 ===
/**
// === CODE ===
/**
@@
-16,7
+22,7
@@
extern tVFS_Mount *gRootMount;
* \brief Create a new node
* \param Path Path of directory to create
*/
* \brief Create a new node
* \param Path Path of directory to create
*/
-int VFS_MkDir(char *Path)
+int VFS_MkDir(c
onst c
har *Path)
{
return VFS_MkNod(Path, VFS_FFLAG_DIRECTORY);
}
{
return VFS_MkNod(Path, VFS_FFLAG_DIRECTORY);
}
@@
-27,42
+33,56
@@
int VFS_MkDir(char *Path)
* \param Path Path of new node
* \param Flags Flags to apply to the node
*/
* \param Path Path of new node
* \param Flags Flags to apply to the node
*/
-int VFS_MkNod(char *Path, Uint Flags)
+int VFS_MkNod(c
onst c
har *Path, Uint Flags)
{
char *absPath, *name;
{
char *absPath, *name;
- int pos=0, oldpos = 0;
+ int pos = 0, oldpos = 0;
+ int next = 0;
tVFS_Node *parent;
int ret;
tVFS_Node *parent;
int ret;
-
Debug_Enter("VFS_MkNod",
"sPath xFlags", Path, Flags);
+
ENTER(
"sPath xFlags", Path, Flags);
absPath = VFS_GetAbsPath(Path);
absPath = VFS_GetAbsPath(Path);
+ LOG("absPath = '%s'", absPath);
- while( (pos = strpos8(&absPath[pos+1], '/')) != -1 ) oldpos = pos;
+ while( (next = strpos(&absPath[pos+1], '/')) != -1 ) {
+ LOG("next = %i", next);
+ pos += next+1;
+ LOG("pos = %i", pos);
+ oldpos = pos;
+ }
absPath[oldpos] = '\0'; // Mutilate path
name = &absPath[oldpos+1];
absPath[oldpos] = '\0'; // Mutilate path
name = &absPath[oldpos+1];
+ LOG("absPath = '%s', name = '%s'", absPath, name);
+
// Check for root
if(absPath[0] == '\0')
// Check for root
if(absPath[0] == '\0')
- parent = VFS_ParsePath("/", NULL);
+ parent = VFS_ParsePath("/", NULL
, NULL
);
else
else
- parent = VFS_ParsePath(absPath, NULL);
+ parent = VFS_ParsePath(absPath, NULL, NULL);
+
+ LOG("parent = %p", parent);
- if(!parent) return -1; // Error Check
+ if(!parent) {
+ LEAVE('i', -1);
+ return -1; // Error Check
+ }
// Permissions Check
if( !VFS_CheckACL(parent, VFS_PERM_EXECUTE|VFS_PERM_WRITE) ) {
if(parent->Close) parent->Close( parent );
free(absPath);
// Permissions Check
if( !VFS_CheckACL(parent, VFS_PERM_EXECUTE|VFS_PERM_WRITE) ) {
if(parent->Close) parent->Close( parent );
free(absPath);
-
Debug_Leave("VFS_MkNod",
'i', -1);
+
LEAVE(
'i', -1);
return -1;
}
return -1;
}
-
Debug_Log("VFS_MkNod", "parent = %p\n
", parent);
+
LOG("parent = %p
", parent);
if(parent->MkNod == NULL) {
Warning("VFS_MkNod - Directory has no MkNod method");
if(parent->MkNod == NULL) {
Warning("VFS_MkNod - Directory has no MkNod method");
-
Debug_Leave("VFS_MkNod",
'i', -1);
+
LEAVE(
'i', -1);
return -1;
}
return -1;
}
@@
-76,40
+96,49
@@
int VFS_MkNod(char *Path, Uint Flags)
if(parent->Close) parent->Close( parent );
// Error Check
if(parent->Close) parent->Close( parent );
// Error Check
- if(ret == 0) return -1;
+ if(ret == 0) {
+ LEAVE('i', -1);
+ return -1;
+ }
-
Debug_Leave("VFS_MkNod",
'i', 0);
+
LEAVE(
'i', 0);
return 0;
}
/**
return 0;
}
/**
- * \fn int VFS_Symlink(c
har *Name,
char *Link)
+ * \fn int VFS_Symlink(c
onst 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
*/
* \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(c
har *Name,
char *Link)
+int VFS_Symlink(c
onst char *Name, const
char *Link)
{
char *realLink;
int fp;
tVFS_Node *destNode;
{
char *realLink;
int fp;
tVFS_Node *destNode;
+ char *_link;
- //
LogF("vfs_symlink: (name='%s', link='%s')\n", name, l
ink);
+ //
ENTER("sName sLink", Name, L
ink);
// Get absolue path name
// Get absolue path name
-
L
ink = VFS_GetAbsPath( Link );
- if(!
L
ink) {
-
Warning(
"Path '%s' is badly formed", Link);
+
_l
ink = VFS_GetAbsPath( Link );
+ if(!
_l
ink) {
+
Log_Warning("VFS",
"Path '%s' is badly formed", Link);
return -1;
}
return -1;
}
+ destNode = VFS_ParsePath( _link, &realLink, NULL );
+ #if 0
// Get true path and node
// Get true path and node
- destNode = VFS_ParsePath( Link, &realLink );
- free(Link);
+ free(_link);
+ _link = NULL;
+ #else
+ realLink = _link;
+ #endif
// Check if destination exists
if(!destNode) {
// Check if destination exists
if(!destNode) {
-
Warning(
"File '%s' does not exist, symlink not created", Link);
+
Log_Warning("VFS",
"File '%s' does not exist, symlink not created", Link);
return -1;
}
return -1;
}
@@
-118,7
+147,7
@@
int VFS_Symlink(char *Name, char *Link)
// Make node
if( VFS_MkNod(Name, VFS_FFLAG_SYMLINK) != 0 ) {
// Make node
if( VFS_MkNod(Name, VFS_FFLAG_SYMLINK) != 0 ) {
-
Warning(
"Unable to create link node '%s'", Name);
+
Log_Warning("VFS",
"Unable to create link node '%s'", Name);
return -2; // Make link node
}
return -2; // Make link node
}
@@
-141,20
+170,36
@@
int VFS_ReadDir(int FD, char *Dest)
tVFS_Handle *h = VFS_GetHandle(FD);
char *tmp;
tVFS_Handle *h = VFS_GetHandle(FD);
char *tmp;
-
if(h) return -1
;
+
//ENTER("ph pDest", h, Dest)
;
- if(h->Node->ReadDir == NULL) return 0;
+ if(!h || h->Node->ReadDir == NULL) {
+ //LEAVE('i', 0);
+ return 0;
+ }
- tmp = h->Node->ReadDir(h->Node, h->Position);
- LOG("tmp = '%s'", tmp);
+ if(h->Node->Size != -1 && h->Position >= h->Node->Size) {
+ //LEAVE('i', 0);
+ return 0;
+ }
- if(!tmp) return 0;
+ do {
+ tmp = h->Node->ReadDir(h->Node, h->Position);
+ if((Uint)tmp < (Uint)VFS_MAXSKIP)
+ h->Position += (Uint)tmp;
+ else
+ h->Position ++;
+ } while(tmp != NULL && (Uint)tmp < (Uint)VFS_MAXSKIP);
-
h->Position ++
;
+
//LOG("tmp = '%s'", tmp)
;
- strcpy(Dest, tmp);
+ if(!tmp) {
+ //LEAVE('i', 0);
+ return 0;
+ }
- if(IsHeap(tmp)) free(tmp);
+ strcpy(Dest, tmp);
+ free(tmp);
+ //LEAVE('i', 1);
return 1;
}
return 1;
}
UCC
git Repository :: git.ucc.asn.au