Usermode - Renamed VFS syscalls to _Sys* to remove POSIX collisions

[tpg/acess2.git] / Usermode / Applications / CLIShell_src / main.c

diff --git a/Usermode/Applications/CLIShell_src/main.c b/Usermode/Applications/CLIShell_src/main.c
index 24889fa..be621c4 100644 (file)
--- a/Usermode/Applications/CLIShell_src/main.c
+++ b/Usermode/Applications/CLIShell_src/main.c
@@ -165,15 +165,15 @@ void CallCommand(char **Args)
        {\r
                GeneratePath(exefile, gsCurrentDirectory, sTmpBuffer);\r
                // Check file existence\r
-               fd = open(sTmpBuffer, OPENFLAG_EXEC);\r
+               fd = _SysOpen(sTmpBuffer, OPENFLAG_EXEC);\r
                if(fd == -1) {\r
                        printf("Unknown Command: `%s'\n", Args[0]);     // Error Message\r
                        return ;\r
                }\r
                \r
                // Get File info and close file\r
-               finfo( fd, &info, 0 );\r
-               close( fd );\r
+               _SysFInfo( fd, &info, 0 );\r
+               _SysClose( fd );\r
                \r
                // Check if the file is a directory\r
                if(info.flags & FILEFLAG_DIRECTORY) {\r
@@ -189,10 +189,10 @@ void CallCommand(char **Args)
                for( i = 0; i < giNumPathDirs; i++ )\r
                {\r
                        GeneratePath(exefile, gasPathDirs[i], sTmpBuffer);\r
-                       fd = open(sTmpBuffer, OPENFLAG_EXEC);\r
+                       fd = _SysOpen(sTmpBuffer, OPENFLAG_EXEC);\r
                        if(fd == -1)    continue;\r
-                       finfo( fd, &info, 0 );\r
-                       close( fd );\r
+                       _SysFInfo( fd, &info, 0 );\r
+                       _SysClose( fd );\r
                        if(info.flags & FILEFLAG_DIRECTORY)     continue;\r
                        // Woohoo! We found a valid command\r
                        break;\r
@@ -256,7 +256,7 @@ void Command_Help(int argc, char **argv)
  */\r
 void Command_Clear(int argc, char **argv)\r
 {\r
-       write(_stdout, "\x1B[2J", 4);   //Clear Screen\r
+       _SysWrite(_stdout, "\x1B[2J", 4);       //Clear Screen\r
 }\r
 \r
 /**\r
@@ -277,13 +277,13 @@ void Command_Cd(int argc, char **argv)
        \r
        GeneratePath(argv[1], gsCurrentDirectory, tmpPath);\r
        \r
-       fp = open(tmpPath, 0);\r
+       fp = _SysOpen(tmpPath, 0);\r
        if(fp == -1) {\r
                printf("Directory does not exist\n");\r
                return;\r
        }\r
-       finfo(fp, &stats, 0);\r
-       close(fp);\r
+       _SysFInfo(fp, &stats, 0);\r
+       _SysClose(fp);\r
        \r
        if( !(stats.flags & FILEFLAG_DIRECTORY) ) {\r
                printf("Not a Directory\n");\r
@@ -295,7 +295,7 @@ void Command_Cd(int argc, char **argv)
        strcpy(gsCurrentDirectory, tmpPath);\r
        \r
        // Register change with kernel\r
-       chdir( gsCurrentDirectory );\r
+       _SysChdir( gsCurrentDirectory );\r
 }\r
 \r
 /**\r
@@ -321,7 +321,7 @@ void Command_Dir(int argc, char **argv)
        dirLen = strlen(tmpPath);\r
        \r
        // Open Directory\r
-       dp = open(tmpPath, OPENFLAG_READ);\r
+       dp = _SysOpen(tmpPath, OPENFLAG_READ);\r
        // Check if file opened\r
        if(dp == -1)\r
        {\r
@@ -329,16 +329,16 @@ void Command_Dir(int argc, char **argv)
                return;\r
        }\r
        // Get File Stats\r
-       if( finfo(dp, &info, 0) == -1 )\r
+       if( _SysFInfo(dp, &info, 0) == -1 )\r
        {\r
-               close(dp);\r
+               _SysClose(dp);\r
                printf("stat Failed, Bad File Descriptor\n");\r
                return;\r
        }\r
        // Check if it's a directory\r
        if(!(info.flags & FILEFLAG_DIRECTORY))\r
        {\r
-               close(dp);\r
+               _SysClose(dp);\r
                printf("Unable to open directory `%s', Not a directory\n", tmpPath);\r
                return;\r
        }\r
@@ -352,7 +352,7 @@ void Command_Dir(int argc, char **argv)
        \r
        fileName = (char*)(tmpPath+dirLen);\r
        // Read Directory Content\r
-       while( (fp = SysReadDir(dp, fileName)) )\r
+       while( (fp = _SysReadDir(dp, fileName)) )\r
        {\r
                if(fp < 0)\r
                {\r
@@ -361,10 +361,10 @@ void Command_Dir(int argc, char **argv)
                        break;\r
                }\r
                // Open File\r
-               fp = open(tmpPath, 0);\r
+               fp = _SysOpen(tmpPath, 0);\r
                if(fp == -1)    continue;\r
                // Get File Stats\r
-               finfo(fp, &info, 0);\r
+               _SysFInfo(fp, &info, 0);\r
                \r
                if(info.flags & FILEFLAG_DIRECTORY)\r
                        printf("d");\r
@@ -391,7 +391,7 @@ void Command_Dir(int argc, char **argv)
                if(acl.perms & 2)       modeStr[7] = 'w';       else    modeStr[7] = '-';\r
                if(acl.perms & 8)       modeStr[8] = 'x';       else    modeStr[8] = '-';\r
                printf(modeStr);\r
-               close(fp);\r
+               _SysClose(fp);\r
                \r
                // Colour Code\r
                if(info.flags & FILEFLAG_DIRECTORY)     // Directory: Green\r
@@ -412,5 +412,5 @@ void Command_Dir(int argc, char **argv)
                printf("\n");\r
        }\r
        // Close Directory\r
-       close(dp);\r
+       _SysClose(dp);\r
 }\r