VFS API break: Introduce FDisplayName propertyv0.6.52

1 files changed, 13 insertions, 9 deletions

diff --git a/vfs/UVFSCore.pas b/vfs/UVFSCore.pas
index c1e8fd4..539295d 100644
--- a/vfs/UVFSCore.pas
+++ b/vfs/UVFSCore.pas
@@ -167,7 +167,7 @@ const ConstGlobalModulePath1 = '/usr/lib/tuxcmd';
       ConstLocalModulePath2 = './plugins';
       ConstLocalModulePath3 = '../lib/tuxcmd';
 
-      ConstVFSVersionRequired = 2;
+      ConstVFSVersionRequired = cVFSVersion;
 
 var BinaryPath: string;
 
@@ -302,7 +302,7 @@ begin
   
 {
   DebugMsg(['sizeof(TVFSItem) = ', sizeof(TVFSItem)]);
-  DebugMsg(['sizeof(TVFSItem.sFileName) = ', sizeof(TVFSItem.sFileName)]);
+  DebugMsg(['sizeof(TVFSItem.FName) = ', sizeof(TVFSItem.FName)]);
   DebugMsg(['sizeof(TVFSItem.iSize) = ', sizeof(TVFSItem.iSize)]);
   DebugMsg(['sizeof(TVFSItem.m_time) = ', sizeof(TVFSItem.m_time)]);
   DebugMsg(['sizeof(TVFSItem.a_time) = ', sizeof(TVFSItem.a_time)]);
@@ -369,7 +369,7 @@ begin
 
     repeat
 //          DebugMsg(['begin--']);
-      if AddDotFiles or (not ((Length(P^.sFileName) > 1) and (P^.sFileName[0] = '.') and (P^.sFileName[1] <> '.'))) then begin
+      if AddDotFiles or (not ((Length(P^.FName) > 1) and (P^.FName[0] = '.') and (P^.FName[1] <> '.'))) then begin
 //            DebugMsg(['Checkpoint 1']);
         Item := malloc(SizeOf(TDataItem));
         memset(Item, 0, SizeOf(TDataItem));
@@ -378,8 +378,8 @@ begin
 //            DebugMsg(['Checkpoint 3']);
         with Item^ do
           try
-            FName := strdup(P^.sFileName);
-            FDisplayName := StrToUTF8(P^.sFileName);
+            FName := strdup(P^.FName);
+            FDisplayName := strdup(P^.FDisplayName);
             if P^.sLinkTo <> nil
               then begin
                      LnkPointTo := strdup(P^.sLinkTo);
@@ -572,9 +572,11 @@ begin
     Item := malloc(SizeOf(TDataItemSL));
     memset(Item, 0, SizeOf(TDataItemSL));
     with Item^ do begin
-{      FName := strdup(P^.sFileName);
-      FDisplayName := StrToUTF8(P^.sFileName); }
+{      FName := strdup(P^.FName);
+      FDisplayName := StrToUTF8(P^.FName); }
       FName := strdup(PChar(APath));
+
+      //* TODO
       FDisplayName := StrToUTF8(PChar(APath));
       if P^.sLinkTo <> nil then LnkPointTo := strdup(P^.sLinkTo)
                            else LnkPointTo := nil;
@@ -635,6 +637,8 @@ var Item: PDataItemSL;
 //      AName := malloc(Length(FPath) + 1);
 //      memset(AName, 0, Length(FPath) + 1);
       FName := strdup(PChar(FPath));
+
+      //* TODO
       FDisplayName := StrToUTF8(PChar(FPath));
       if P^.sLinkTo <> nil then LnkPointTo := strdup(P^.sLinkTo)
                            else LnkPointTo := nil;
@@ -689,8 +693,8 @@ begin
 
     repeat
       if TVFSItemType(P^.ItemType) = vDirectory
-        then LocalList.Add(APath + String(P^.sFileName))
-        else AddEntry(APath + String(P^.sFileName), False, True);
+        then LocalList.Add(APath + String(P^.FName))
+        else AddEntry(APath + String(P^.FName), False, True);
       libc_free(P);
       P := malloc(SizeOf(TVFSItem));
       memset(P, 0, SizeOf(TVFSItem));