(none)

diff --git a/aplfw/build/win/win32/vc60/hosaplfw.dsp b/aplfw/build/win/win32/vc60/hosaplfw.dsp
index 7c6c1b3..2b6994c 100755 (executable)
--- a/aplfw/build/win/win32/vc60/hosaplfw.dsp
+++ b/aplfw/build/win/win32/vc60/hosaplfw.dsp
@@ -448,11 +448,59 @@ SOURCE=..\..\..\..\system\file\confile.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\system\file\file.c
+SOURCE=..\..\..\..\system\file\file.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\system\file\file.h
+SOURCE=..\..\..\..\system\file\file_adddevice.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_addvolume.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_getchar.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_getstring.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_initialize.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_iocontrol.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_local.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_putchar.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_putstring.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_read.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_seek.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\file_write.c
 # End Source File
 # Begin Source File
 
@@ -464,12 +512,36 @@ SOURCE=..\..\..\..\system\file\fileobj.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\system\file\fileobj_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\fileobj_delete.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\system\file\stdfile.c
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\..\..\system\file\stdfile.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\volume.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\volume_openfile.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\volumeobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\file\volumeobj_create.c
+# End Source File
 # End Group
 # Begin Group "memory"
 
@@ -488,19 +560,23 @@ SOURCE=..\..\..\..\system\memory\memory.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\..\system\handle\handle.c
+SOURCE=..\..\..\..\system\handle\handle.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\system\handle\handle.h
+SOURCE=..\..\..\..\system\handle\handle_close.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\system\handle\hdlobj.c
+SOURCE=..\..\..\..\system\handle\handleobj.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\system\handle\hdlobj.h
+SOURCE=..\..\..\..\system\handle\handleobj_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\system\handle\handleobj_delete.c
 # End Source File
 # End Group
 # Begin Group "shell"
@@ -568,6 +644,106 @@ SOURCE=..\..\..\..\apl\memdump\memdump.c
 # End Source File
 # End Group
 # End Group
+# Begin Group "volume"
+
+# PROP Default_Filter ""
+# Begin Group "dev"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\dev\devvol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\dev\devvol_adddevice.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\dev\devvol_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\dev\devvol_delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\dev\devvol_local.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\dev\devvol_openfile.c
+# End Source File
+# End Group
+# Begin Group "fat"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatfile_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatfile_local.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatfile_read.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_clusterread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_clusterwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_createfile.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_flushfat.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_getclusterbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_getnextcluster.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_local.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_relclusterbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\volume\fat\fatvol_setnextcluster.c
+# End Source File
+# End Group
+# End Group
 # Begin Source File
 
 SOURCE=..\..\..\..\hosaplfw.h

diff --git a/aplfw/sample/win/win32/sample.c b/aplfw/sample/win/win32/sample.c
index 92cf62c..729355c 100755 (executable)
--- a/aplfw/sample/win/win32/sample.c
+++ b/aplfw/sample/win/win32/sample.c
@@ -15,7 +15,7 @@
 #include "kernel.h"
 #include "kernel_id.h"
 #include "system/sysapi/sysapi.h"
-#include "system/file/filesys.h"
+#include "system/file/file.h"
 #include "system/file/confile.h"
 #include "system/process/process.h"
 #include "system/command/command.h"
@@ -40,10 +40,10 @@ void Sample_Initialize(VP_INT exinf)
 /* 初期化タスク */
 void Sample_Startup(VP_INT exinf)
 {
-       T_SYSFILE_DEVINF DevInf;
-       T_PROCESS_INFO   ProcInfo;
-       HANDLE           hTty;
-       HANDLE           hCon;
+       T_FILE_DEVINF  DevInf;
+       T_PROCESS_INFO ProcInfo;
+       HANDLE         hTty;
+       HANDLE         hCon;
        
        /*************************/
        /*       初期化          */
@@ -51,6 +51,7 @@ void Sample_Startup(VP_INT exinf)
        
        /* システム初期化 */
        System_Initialize(g_SystemHeap, sizeof(g_SystemHeap));
+       File_Initialize();
 
 
        /*************************/
@@ -65,7 +66,7 @@ void Sample_Startup(VP_INT exinf)
        DevInf.pfncCreate = WinSockFile_Create;
        DevInf.ObjSize    = sizeof(C_WINSOCKFILE);
        DevInf.pParam     = &g_WinSockDrv[0];
-       SysFile_AddDevice("/dev", &DevInf);
+       File_AddDevice(&DevInf);
 
        /*************************/
        /*     コマンド登録      */
@@ -85,7 +86,7 @@ void Sample_Startup(VP_INT exinf)
        DevInf.pfncCreate = ConsoleFile_Create;
        DevInf.ObjSize    = sizeof(C_CONSOLEFILE);
        DevInf.pParam     = hTty;
-       SysFile_AddDevice("/dev", &DevInf);
+       File_AddDevice(&DevInf);
        hCon = File_Open("/dev/con", FILE_MODE_READ | FILE_MODE_WRITE);
        
        ProcInfo.hTty    = hTty;
@@ -102,7 +103,7 @@ void Sample_Startup(VP_INT exinf)
 int System_Boot(VPARAM Param)
 {
        /* シェル起動 */
-       return Command_Execute("hsh");
+       return Command_Execute("hsh", NULL);
 }
 
 

diff --git a/aplfw/system/file/file_putstring.c b/aplfw/system/file/file_putstring.c
index cdf55bd..55963d6 100755 (executable)
--- a/aplfw/system/file/file_putstring.c
+++ b/aplfw/system/file/file_putstring.c
@@ -9,6 +9,7 @@
  */
 
 
+#include <string.h>
 #include <stdio.h>
 #include "file_local.h"
 

diff --git a/aplfw/volume/fat/fatvol_open.c b/aplfw/volume/fat/fatvol_open.c
index eb0315d..1f494c6 100755 (executable)
--- a/aplfw/volume/fat/fatvol_open.c
+++ b/aplfw/volume/fat/fatvol_open.c
@@ -65,16 +65,16 @@ HANDLE FatVol_Open(C_FATVOL *self, const char *pszPath, int iMode)
                                {
                                        break;
                                }
-                               szEntryName[iEntryNameLen++] == (char)ubBuf[0+j];
+                               szEntryName[iEntryNameLen++] = (char)ubBuf[0+j];
                        }
-                       szEntryName[iEntryNameLen++] == '.';
+                       szEntryName[iEntryNameLen++] = '.';
                        for ( j = 0; j < 3; j++ )
                        {
                                if ( ubBuf[8+j] == ' ' || ubBuf[8+j] == '\0' )
                                {
                                        break;
                                }
-                               szEntryName[iEntryNameLen++] == (char)ubBuf[8+j];
+                               szEntryName[iEntryNameLen++] = (char)ubBuf[8+j];
                        }
                        szEntryName[iEntryNameLen++] = '\0';
                        if ( iEntryNameLen > 2 && szEntryName[iEntryNameLen-1] == '.' )