Fixed Double-Relocation in modules.c (edited bin/elf.c to find this)

[tpg/acess2.git] / Kernel / vfs / acls.c

diff --git a/Kernel/vfs/acls.c b/Kernel/vfs/acls.c
index 9ef4676..ac3e8ba 100644 (file)
--- a/Kernel/vfs/acls.c
+++ b/Kernel/vfs/acls.c
@@ -1,7 +1,7 @@
 /* 
  * Acess Micro VFS
  */
-#include <common.h>
+#include <acess.h>
 #include "vfs.h"
 #include "vfs_int.h"
 
@@ -65,7 +65,9 @@ int VFS_GetACL(int FD, tVFS_ACL *Dest)
        tVFS_Handle     *h = VFS_GetHandle(FD);
        
        // Error check
-       if(!h)  return -1;
+       if(!h) {
+               return -1;
+       }
        
        // Root can do anything
        if(Dest->Group == 0 && Dest->ID == 0) {
@@ -97,3 +99,47 @@ int VFS_GetACL(int FD, tVFS_ACL *Dest)
        Dest->Perms = 0;
        return 0;
 }
+
+/**
+ * \fn tVFS_ACL *VFS_UnixToAcessACL(Uint Mode, Uint Owner, Uint Group)
+ * \brief Converts UNIX permissions to three Acess ACL entries
+ */
+tVFS_ACL *VFS_UnixToAcessACL(Uint Mode, Uint Owner, Uint Group)
+{
+       tVFS_ACL        *ret = malloc(sizeof(tVFS_ACL)*3);
+       
+       // Error Check
+       if(!ret)        return NULL;
+       
+       // Owner
+       ret[0].Group = 0;       ret[0].ID = Owner;
+       ret[0].Inv = 0;         ret[0].Perms = 0;
+       if(Mode & 0400) ret[0].Perms |= VFS_PERM_READ;
+       if(Mode & 0200) ret[0].Perms |= VFS_PERM_WRITE;
+       if(Mode & 0100) ret[0].Perms |= VFS_PERM_EXECUTE;
+       
+       // Group
+       ret[1].Group = 1;       ret[1].ID = Group;
+       ret[1].Inv = 0;         ret[1].Perms = 0;
+       if(Mode & 0040) ret[1].Perms |= VFS_PERM_READ;
+       if(Mode & 0020) ret[1].Perms |= VFS_PERM_WRITE;
+       if(Mode & 0010) ret[1].Perms |= VFS_PERM_EXECUTE;
+       
+       // Global
+       ret[2].Group = 1;       ret[2].ID = Group;
+       ret[2].Inv = 0;         ret[2].Perms = 0;
+       if(Mode & 0004) ret[2].Perms |= VFS_PERM_READ;
+       if(Mode & 0002) ret[2].Perms |= VFS_PERM_WRITE;
+       if(Mode & 0001) ret[2].Perms |= VFS_PERM_EXECUTE;
+       
+       // Return buffer
+       return ret;
+}
+
+// === EXPORTS ===
+// --- Variables ---
+EXPORTV(gVFS_ACL_EveryoneRWX);
+EXPORTV(gVFS_ACL_EveryoneRW);
+EXPORTV(gVFS_ACL_EveryoneRX);
+// --- Functions ---
+EXPORT(VFS_UnixToAcessACL);