Misc. ULibc fixes

1 files changed, 21 insertions, 21 deletions

diff --git a/vfs/UVFSCore.pas b/vfs/UVFSCore.pas
index 216cd5e..594eabf 100644
--- a/vfs/UVFSCore.pas
+++ b/vfs/UVFSCore.pas
@@ -259,14 +259,14 @@ begin
     s := FVFSGetArchiveExts();
     if s <> nil then begin
       ParseString(String(s), ';', Extensions);
-      real_libc_free(s);
+      libc_free(s);
     end;
   end;
   if (FVFSGetNetworkServices <> nil) and (FVFSOpenURI <> nil) then begin
     s := FVFSGetNetworkServices();
     if s <> nil then begin
       ParseString(String(s), ';', Services);
-      real_libc_free(s);
+      libc_free(s);
     end;
   end;
 end;
@@ -289,10 +289,10 @@ end;
 procedure _free_PVFSInfo(Info: PVFSInfo);
 begin
   if Info <> nil then begin
-    if Info^.Name <> nil then real_libc_free(Info^.Name);
-    if Info^.ID <> nil then real_libc_free(Info^.ID);
-    if Info^.About <> nil then real_libc_free(Info^.About);
-    if Info^.Copyright <> nil then real_libc_free(Info^.Copyright);
+    if Info^.Name <> nil then libc_free(Info^.Name);
+    if Info^.ID <> nil then libc_free(Info^.ID);
+    if Info^.About <> nil then libc_free(Info^.About);
+    if Info^.Copyright <> nil then libc_free(Info^.Copyright);
   end;
 end;
 
@@ -481,10 +481,10 @@ begin
         Item := GetDataItemFromVFSItem(P);
         List.Add(Item);
       end;
-      if P^.FName <> nil then real_libc_free(P^.FName);
-      if P^.FDisplayName <> nil then real_libc_free(P^.FDisplayName);
-      if P^.sLinkTo <> nil then real_libc_free(P^.sLinkTo);
-      real_libc_free(P);
+      if P^.FName <> nil then libc_free(P^.FName);
+      if P^.FDisplayName <> nil then libc_free(P^.FDisplayName);
+      if P^.sLinkTo <> nil then libc_free(P^.sLinkTo);
+      libc_free(P);
       P := FSourcePlugin.FVFSListNext(FGlobs, Error);
       VFSToTuxcmdError(Error, TUXCMD_ERROR_OPENDIR);
     end;
@@ -497,7 +497,7 @@ begin
       g_set_error_literal(Error, TUXCMD_ERROR, gint(TUXCMD_ERROR_CANCELLED), 'The operation has been cancelled.');
       Result := False;
     end;
-    real_libc_free(P);
+    libc_free(P);
     FSourcePlugin.FVFSListClose(FGlobs, nil);
   except
     on E: Exception do begin
@@ -525,10 +525,10 @@ begin
     VFSToTuxcmdError(Error, TUXCMD_ERROR_STAT);
     if P <> nil then begin
       Result := GetDataItemFromVFSItem(P);
-      if P^.FName <> nil then real_libc_free(P^.FName);
-      if P^.FDisplayName <> nil then real_libc_free(P^.FDisplayName);
-      if P^.sLinkTo <> nil then real_libc_free(P^.sLinkTo);
-      real_libc_free(P);
+      if P^.FName <> nil then libc_free(P^.FName);
+      if P^.FDisplayName <> nil then libc_free(P^.FDisplayName);
+      if P^.sLinkTo <> nil then libc_free(P^.sLinkTo);
+      libc_free(P);
     end;
   except
     on E: Exception do begin
@@ -557,7 +557,7 @@ begin
     FSFree := AFSFree;
     if AFSName <> nil then begin
       FSName := string(AFSName);
-      real_libc_free(AFSName);
+      libc_free(AFSName);
     end;
   end;
 end;
@@ -583,7 +583,7 @@ begin
     s := FSourcePlugin.FVFSGetPath(FGlobs);
     if s <> nil then begin
       Result := String(s);
-      real_libc_free(s);
+      libc_free(s);
     end;
   end;
 end;
@@ -596,7 +596,7 @@ begin
     s := FSourcePlugin.FVFSGetPathURI(FGlobs);
     if s <> nil then begin
       Result := String(s);
-      real_libc_free(s);
+      libc_free(s);
     end;
   end;
 end;
@@ -651,7 +651,7 @@ begin
   try
     P := FSourcePlugin.FVFSFileInfo(FGlobs, PChar(FileName), FollowSymlinks, False, nil);
     Result := P <> nil;
-    real_libc_free(P);
+    libc_free(P);
   except
     on E: Exception do
       DebugMsg(['^^VFS (EE): FileExists: Exception: ', E.Message]);
@@ -667,7 +667,7 @@ begin
   try
     P := FSourcePlugin.FVFSFileInfo(FGlobs, PChar(FileName), FollowSymlinks, False, nil);
     Result := (P <> nil) and (TVFSItemType(P^.ItemType) = vDirectory);
-    real_libc_free(P);
+    libc_free(P);
   except
     on E: Exception do
       DebugMsg(['^^VFS (EE): FileExists: Exception: ', E.Message]);
@@ -1148,7 +1148,7 @@ end;
 procedure DoInitPlugins;
 begin
   if ParamDebug then
-    setenv('TUXCMD_DEBUG', '1', 1);
+    g_setenv('TUXCMD_DEBUG', '1', True);
   PluginList := TList.Create;
   if not ParamDisablePlugins then begin
     BinaryPath := GetBinaryPath;