Changeset 865 for Whitix/trunk/fs/infofs/info.c

Timestamp:

09/01/08 18:28:34 (4 years ago)

Author:

mwhitworth

Message:

Add various read function, add soft link functions.

Files:

• Whitix/trunk/fs/infofs/info.c (modified) (6 diffs)

Whitix/trunk/fs/infofs/info.c

@@ -8 +8 @@
 static struct KeFsEntry root;
 
-int InfoAddIntEntry(struct KeFsEntry* dir, char* name, int* value)
+int InfoReadInt(int* position, struct IcFsEntry* iEnt, char* data, DWORD size)
+{
+        int copied;
+        
+        copied=MIN(size-*position, sizeof(int)-*position);
+        
+        memcpy(data, iEnt->iVal+*position, copied);
+        
+        *position+=copied;
+        
+        return copied;
+}
+
+int InfoReadStr(int* position, struct IcFsEntry* iEnt, char* data, DWORD size)
+{
+        int copied;
+        
+        copied=MIN(size-*position, strlen(iEnt->sVal)-*position);
+        
+        memcpy(data, iEnt->sVal+*position, copied);
+        
+        *position+=copied;
+        
+        return copied;
+}
+
+int InfoReadArray(int* position, struct IcFsEntry* iEnt, char* data, DWORD size)
+{
+        int copied;
+        
+        copied=MIN(size-*position, iEnt->size-*position);
+        
+        memcpy(data, iEnt->csVal+*position, copied);
+        
+        *position+=copied;
+        
+        return copied;
+}
+
+int IcRead(int* position, struct IcFsEntry* iEnt, char* data, DWORD size)
+{
+        switch (iEnt->type)
+        {
+                case ICFS_TYPE_INT:
+                        return InfoReadInt(position, iEnt, data, size);
+                        
+                case ICFS_TYPE_STR:
+                        return InfoReadStr(position, iEnt, data, size);
+                        
+                case ICFS_TYPE_BYTE:
+                        return InfoReadArray(position, iEnt, data, size);
+                        
+                default:
+                        KePrint("TODO: %d\n", iEnt->type);
+        }
+        
+        return -EINVAL;
+}
+
+SYMBOL_EXPORT(IcRead);
+
+int IcWriteInt(int* position, struct IcFsEntry* iEnt, char* data, DWORD size)
+{
+        int copied;
+        
+        copied=MIN(size-*position, sizeof(int)-*position);
+        
+        memcpy(iEnt->iVal+*position, data, copied);
+        
+        *position+=copied;
+        
+        return copied;
+}
+
+int IcWrite(int* position, struct IcFsEntry* iEnt, char* data, DWORD size)
+{
+        switch (iEnt->type)
+        {
+                case ICFS_TYPE_INT:
+                        return IcWriteInt(position, iEnt, data, size);
+                        
+                default:
+                        KePrint("TODO: %d\n", iEnt->type);              
+        }
+        
+        return -EINVAL;
+}
+
+SYMBOL_EXPORT(IcWrite);
+
+int IcFsAddIntEntry(struct KeFsEntry* fsRoot, struct KeFsEntry* dir, char* name, int* value)
 {
         struct KeFsEntry* entry;
@@ -14 +104 @@
         
         if (!dir)
-                dir=&root;
+                dir=fsRoot;
         
         entry=KeFsAddEntry(&dir->dir, name);
@@ -27 +117 @@
 }
 
-int InfoAddStrEntry(struct KeFsEntry* dir, char* name, char* str)
+int InfoAddIntEntry(struct KeFsEntry* dir, char* name, int* value)
+{
+        return IcFsAddIntEntry(&root, dir, name, value);
+}
+
+struct IcFsEntry* IcFsAddStrEntry(struct KeFsEntry* fsRoot, struct KeFsEntry* dir, char* name, char* str)
 {
         struct KeFsEntry* entry;
@@ -33 +128 @@
         
         if (!dir)
-                dir=&root;
+                dir=&fsRoot;
                 
         entry=KeFsAddEntry(&dir->dir, name);
@@ -43 +138 @@
         entry->file=newEnt;
         
-        return 0;
-}
-
-struct KeFsEntry* InfoCreateDir(struct KeFsEntry* dir, char* name)
-{
-        if (!dir)
-                dir=&root;
+        return newEnt;
+}
+
+int IcFsAddSoftLink(struct KeFsEntry* fsRoot, struct KeFsEntry* dir, char* name, int (*followLink)(char* buffer, int size))
+{
+        struct KeFsEntry* entry;
+        
+        if (!dir)
+                dir=&fsRoot;
+                
+        entry=KeFsAddEntry(&dir->dir, name);
+        
+        entry->type &= ~VFS_ATTR_FILE;
+        entry->type |= VFS_ATTR_SOFTLINK;
+        
+        entry->followLink=followLink;
+        
+        return 0;
+}
+
+int InfoAddStrEntry(struct KeFsEntry* dir, char* name, char* str)
+{
+        IcFsAddStrEntry(&root, dir, name, str);
+        return 0;
+}
+
+struct KeFsEntry* IcFsCreateDir(struct KeFsEntry* fsRoot, struct KeFsEntry* dir, char* name)
+{
+        if (!dir)
+                dir=fsRoot;
                 
         return KeFsAddDir(&dir->dir, name);
 }
+
+struct KeFsEntry* InfoCreateDir(struct KeFsEntry* dir, char* name)
+{
+        return IcFsCreateDir(&root, dir, name);
+}
+
+SYMBOL_EXPORT(InfoCreateDir);
 
 DWORD InfoGetRootId()
@@ -76 +201 @@
         InfoCreateDir(NULL, "Memory");
         InfoCreateDir(NULL, "Processes");
-}
+
+        return 0;
+}