Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Tools / DiskTool / src / actions.c

diff --git a/Tools/DiskTool/src/actions.c b/Tools/DiskTool/src/actions.c
index 665a595..5cda588 100644 (file)
--- a/Tools/DiskTool/src/actions.c
+++ b/Tools/DiskTool/src/actions.c
@@ -84,8 +84,6 @@ int DiskTool_MountImage(const char *Identifier, const char *Path)
        
        // Translate path       
        size_t tpath_len = DiskTool_int_TranslatePath(NULL, Path);
-       if(tpath_len == -1)
-               return -1;
        char tpath[tpath_len-1];
        DiskTool_int_TranslatePath(tpath, Path);
        
@@ -143,7 +141,14 @@ int DiskTool_ListDirectory(const char *Directory)
        char    name[256];
        while( VFS_ReadDir(fd, name) )
        {
-               Log("- %s", name);
+               tFInfo  fi;
+               int child = VFS_OpenChild(fd, name, 0);
+               if( child != -1 )
+               {
+                       VFS_FInfo(child, &fi, 0);
+                       VFS_Close(child);
+               }
+               Log("- %02x %6lli %s", fi.flags, fi.size, name);
        }
        
        VFS_Close(fd);
@@ -191,7 +196,7 @@ void DiskTool_LVM_Cleanup(void *Handle)
 int DiskTool_int_TranslateOpen(const char *File, int Flags)
 {
        size_t tpath_len = DiskTool_int_TranslatePath(NULL, File);
-       if(tpath_len == -1)
+       if(tpath_len == 0)
                return -1;
        char tpath[tpath_len-1];
        DiskTool_int_TranslatePath(tpath, File);