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/armv7 - Fixed lack of in*/out* functions
[tpg/acess2.git]
/
Kernel
/
vfs
/
fs
/
root.c
diff --git
a/Kernel/vfs/fs/root.c
b/Kernel/vfs/fs/root.c
index
e9c9f09
..
12417f2
100644
(file)
--- a/
Kernel/vfs/fs/root.c
+++ b/
Kernel/vfs/fs/root.c
@@
-2,6
+2,7
@@
* AcessMicro VFS
* - Root Filesystem Driver
*/
* AcessMicro VFS
* - Root Filesystem Driver
*/
+#define DEBUG 0
#include <acess.h>
#include <vfs.h>
#include <vfs_ramfs.h>
#include <acess.h>
#include <vfs.h>
#include <vfs_ramfs.h>
@@
-72,13
+73,17
@@
tVFS_Node *Root_InitDevice(const char *Device, const char **Options)
int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
{
tRamFS_File *parent = Node->ImplPtr;
int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
{
tRamFS_File *parent = Node->ImplPtr;
- tRamFS_File *child
= parent->Data.FirstChild
;
+ tRamFS_File *child;
tRamFS_File *prev = (tRamFS_File *) &parent->Data.FirstChild;
ENTER("pNode sName xFlags", Node, Name, Flags);
tRamFS_File *prev = (tRamFS_File *) &parent->Data.FirstChild;
ENTER("pNode sName xFlags", Node, Name, Flags);
+ LOG("%i > %i", strlen(Name)+1, sizeof(child->Name));
+ if(strlen(Name) + 1 > sizeof(child->Name))
+ LEAVE_RET('i', 0);
+
// Find last child, while we're at it, check for duplication
// Find last child, while we're at it, check for duplication
- for( ; child; prev = child, child = child->Next )
+ for(
child = parent->Data.FirstChild
; child; prev = child, child = child->Next )
{
if(strcmp(child->Name, Name) == 0) {
LEAVE('i', 0);
{
if(strcmp(child->Name, Name) == 0) {
LEAVE('i', 0);
@@
-89,7
+94,6
@@
int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
child = Root_int_AllocFile();
memset(child, 0, sizeof(tRamFS_File));
child = Root_int_AllocFile();
memset(child, 0, sizeof(tRamFS_File));
- child->Name = malloc(strlen(Name)+1);
strcpy(child->Name, Name);
child->Parent = parent;
strcpy(child->Name, Name);
child->Parent = parent;
@@
-155,7
+159,7
@@
char *Root_ReadDir(tVFS_Node *Node, int Pos)
for( ; child && Pos--; child = child->Next ) ;
for( ; child && Pos--; child = child->Next ) ;
- if(
Pos)
return strdup(child->Name);
+ if(
child)
return strdup(child->Name);
return NULL;
}
return NULL;
}
@@
-214,7
+218,7
@@
tRamFS_File *Root_int_AllocFile(void)
int i;
for( i = 0; i < MAX_FILES; i ++ )
{
int i;
for( i = 0; i < MAX_FILES; i ++ )
{
- if( RootFS_Files[i].Name
== NULL
)
+ if( RootFS_Files[i].Name
[0] == '\0'
)
{
return &RootFS_Files[i];
}
{
return &RootFS_Files[i];
}
UCC
git Repository :: git.ucc.asn.au