X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsfs%2Fsfs.pas;h=49f8f7603f24aa3127894783fe01b33a2e3b3073;hb=03ec2f1d27fdcff9a5a8785806fcd8449f2537a9;hp=3776a0036d7742c6df3160222d12328f5d35e3b1;hpb=20428038ea09152f824e5947da1d550a4774207e;p=d2df-sdl.git

diff --git a/src/sfs/sfs.pas b/src/sfs/sfs.pas
index 3776a00..49f8f76 100644
--- a/src/sfs/sfs.pas
+++ b/src/sfs/sfs.pas
@@ -1,6 +1,7 @@
 // streaming file system (virtual)
-{$MODE DELPHI}
-{.$R-}
+{$MODE OBJFPC}
+{$R+}
+{.$DEFINE SFS_VOLDEBUG}
 unit sfs;
 
 interface
@@ -12,33 +13,29 @@ uses
 type
   ESFSError = class(Exception);
 
-  TSFSChar = AnsiChar;
-  TSFSString = AnsiString;
-
   TSFSVolume = class;
 
   TSFSFileInfo = class
   public
     fOwner: TSFSVolume; // òàê, íà âñÿêèé ñëó÷àé
-    fPath: TSFSString;  // ðàçäåëèòåëè êàòàëîãîâ -- "/"; êîðåíü íèêàê íå îáîçíà÷åí, åñëè íå ïóñòîå, îáÿçàíî çàâåðøàåòñÿ "/"
-    fName: TSFSString;  // òîëüêî èìÿ
+    fPath: AnsiString;  // ðàçäåëèòåëè êàòàëîãîâ -- "/"; êîðåíü íèêàê íå îáîçíà÷åí, åñëè íå ïóñòîå, îáÿçàíî çàâåðøàòüñÿ "/"
+    fName: AnsiString;  // òîëüêî èìÿ
     fSize: Int64;       // unpacked
     fOfs: Int64;        // in VFS (many of 'em need this %-)
 
     constructor Create (pOwner: TSFSVolume);
     destructor Destroy (); override;
 
-    property path: TSFSString read fPath;
-    property name: TSFSString read fName;
-    property size: Int64 read fSize;
+    property path: AnsiString read fPath;
+    property name: AnsiString read fName;
+    property size: Int64 read fSize; // can be -1 if size is unknown
   end;
 
   // âèðòóàëüíàÿ ôàéëîâàÿ ñèñòåìà. ÒÎËÜÊÎ ÄËß ×ÒÅÍÈß!
   // òîì ÍÅ ÄÎËÆÅÍ óáèâàòüñÿ íèêàê èíà÷å, ÷åì ïðè ïîìîùè ôàáðèêè!
   TSFSVolume = class
   protected
-    fRC: Integer; // refcounter for other objects
-    fFileName: TSFSString;// îáû÷íî èìÿ îðèãèíàëüíîãî ôàéëà
+    fFileName: AnsiString;// îáû÷íî èìÿ îðèãèíàëüíîãî ôàéëà
     fFileStream: TStream; // îáû÷íî ïîòîê äëÿ ÷òåíèÿ îðèãèíàëüíîãî ôàéëà
     fFiles: TObjectList;  // TSFSFileInfo èëè íàñëåäíèêè
 
@@ -63,7 +60,7 @@ type
     // ýòà ïðîöåäóðà ìîæåò ìåíÿòü fFiles!
     // fPath -- â ïðàâèëüíîé ôîðìå, ñ "/", êîðíåâîé "/" óáèò, ôèíàëüíûé äîáàâëåí.
     // åñëè ôàéë íå íàéäåí, âåðíóòü -1.
-    function FindFile (const fPath, fName: TSFSString): Integer; virtual;
+    function FindFile (const fPath, fName: AnsiString): Integer; virtual;
 
     // âîçâðàùàåò êîëè÷åñòâî ôàéëîâ â fFiles
     function GetFileCount (): Integer; virtual;
@@ -77,7 +74,7 @@ type
 
   public
     // pSt íå îáÿçàòåëüíî çàïîìèíàòü, åñëè îí íå íóæåí.
-    constructor Create (const pFileName: TSFSString; pSt: TStream); virtual;
+    constructor Create (const pFileName: AnsiString; pSt: TStream); virtual;
     // fFileStream óíè÷òîæàòü íåëüçÿ, åñëè îí ðàâåí ïàðàìåòðó pSt êîíñòðóêòîðà.
     destructor Destroy (); override;
 
@@ -91,7 +88,7 @@ type
     function OpenFileByIndex (const index: Integer): TStream; virtual; abstract;
 
     // åñëè íå ñìîãëî îòêóïîðèòü ôàéëî (èëè åù¸ ãäå îøèáëîñü), çàøâûðí¸ò èñêëþ÷åíèå.
-    function OpenFileEx (const fName: TSFSString): TStream; virtual;
+    function OpenFileEx (const fName: AnsiString): TStream; virtual;
 
     property FileCount: Integer read GetFileCount; // ìîæåò âåðíóòü íîëü
     // ìîæåò âîçâðàùàòü NIL.
@@ -113,13 +110,13 @@ type
     // ôàéëà. åñëè íè îäíà ôàáðèêà ïðåôèêñ íå ïðèçíàåò, òî ôàéë íå îòêðîþò.
     // èñïîëüçóåòñÿ äëÿ ñêèïàíèÿ àâòîäåòåêòà.
     // SFS ÍÅ Ñ×ÈÒÀÅÒ ÏÐÅÔÈÊÑÎÌ ÑÒÐÎÊÓ ÊÎÐÎ×Å ÒÐ¨Õ ÑÈÌÂÎËÎÂ!
-    function IsMyVolumePrefix (const prefix: TSFSString): Boolean; virtual; abstract;
+    function IsMyVolumePrefix (const prefix: AnsiString): Boolean; virtual; abstract;
     // ïðîâåðÿåò, ìîæåò ëè ôàáðèêà ñäåëàòü òîì äëÿ äàííîãî ôàéëà.
     // st -- îòêðûòûé äëÿ ÷òåíèÿ ôàéëîâé ïîòîê. óêàçàòåëü ÷òåíèÿ ñòîèò â íà÷àëå.
     // ýòîò ïîòîê íåëüçÿ çàêðûâàòü!
     // prefix: òî, ÷òî áûëî ïåðåäàíî â IsMyVolumePrefix() èëè ''.
     // èñêëþ÷åíèå ñ÷èòàåòñÿ îøèáêîé, âîçâðàò NIL ñ÷èòàåòñÿ îøèáêîé.
-    function Produce (const prefix, fileName: TSFSString; st: TStream): TSFSVolume; virtual; abstract;
+    function Produce (const prefix, fileName: AnsiString; st: TStream): TSFSVolume; virtual; abstract;
     // êîãäà òîì áîëüøå íå íóæåí, îí áóäåò îòäàí ôàáðèêå íà ïåðåðàáîòêó.
     // äàëåå äâèæîê íå áóäåò þçàòü ñåé òîì.
     procedure Recycle (vol: TSFSVolume); virtual; abstract;
@@ -166,7 +163,10 @@ procedure SFSUnregisterVolumeFactory (factory: TSFSVolumeFactory);
 // è îáðàùàòüñÿ êàê "datafile::xxx".
 // "||" ïðåîáðàçóþòñÿ â ïðîñòîé "|" è ðàçäåëèòåëåì íå ñ÷èòàþòñÿ.
 // ïðèíèìàåòñÿ âî âíèìàíèå òîëüêî ïîñëåäíÿÿ òðóáà.
-function SFSAddDataFile (const dataFileName: TSFSString; top: Boolean=false): Boolean;
+function SFSAddDataFile (const dataFileName: AnsiString; top: Boolean=false): Boolean;
+
+// äîáàâèòü ñáîðíèê âðåìåííî
+function SFSAddDataFileTemp (const dataFileName: AnsiString; top: Boolean=false): Boolean;
 
 // äîáàâèòü â ïîñòîÿííûé ñïèñîê ñáîðíèê èç ïîòîêà ds.
 // åñëè âîçâðàùàåò èñòèíó, òî SFS ñòàíîâèòñÿ âëÿäåëüöåì ïîòîêà ds è ñàìà
@@ -179,32 +179,36 @@ function SFSAddDataFile (const dataFileName: TSFSString; top: Boolean=false): Bo
 // âåðí¸ò ëîæü ïðè îøèáêå.
 // îòêðûâàåò ñáîðíèê èç ïîòîêà. dataFileName -- ÂÈÐÒÓÀËÜÍÎÅ èìÿ.
 // ò.å. íà ñàìîì äåëå òàêîãî ôàéëà ìîæåò è íå áûòü íà äèñêå.
-function SFSAddSubDataFile (const virtualName: TSFSString; ds: TStream; top: Boolean=false): Boolean;
+function SFSAddSubDataFile (const virtualName: AnsiString; ds: TStream; top: Boolean=false): Boolean;
 
 // øâûðÿåòñÿ èñêëþ÷åíèÿìè.
 // åñëè fName íå èìååò óêàçàíèÿ íà ôàéë äàííûõ (ýòî òî, ÷òî îòäåëåíî îò
 // îñòàëüíîãî èìåíè äâîåòî÷èåì), òî èùåì ñíà÷àëà ïî âñåì çàðåãèñòðèðîâàííûì
 // ôàéëàì äàííûõ, ïîòîì â òåêóùåì êàòàëîãå, ïîòîì â êàòàëîãå, îòêóäà ñòàðòîâàëè.
 // åñëè íè÷åãî íå íàøëè, êèäàåì èñêëþ÷åíèå.
-function SFSFileOpenEx (const fName: TSFSString): TStream;
+function SFSFileOpenEx (const fName: AnsiString): TStream;
 
 // ïðè îøèáêå -- NIL, è íèêàêèõ èñêëþ÷åíèé.
-function SFSFileOpen (const fName: TSFSString): TStream;
+function SFSFileOpen (const fName: AnsiString): TStream;
 
 // âîçâðàùàåò NIL ïðè îøèáêå.
 // ïîñëå èñïîëüçîâàíèÿ, íàòóðàëüíî, èòåðàòîð íàäî ãðîõíóòü %-)
-function SFSFileList (const dataFileName: TSFSString): TSFSFileList;
+function SFSFileList (const dataFileName: AnsiString): TSFSFileList;
+
+// çàïðåòèòü îñâîáîæäåíèå âðåìåííûõ òîìîâ (ìîæíî âûçûâàòü ðåêóðñèâíî)
+procedure sfsGCDisable ();
 
-function SFSReplacePathDelims (const s: TSFSString; newDelim: TSFSChar): TSFSString;
-// èãíîðèðóåò ðåãèñòð ñèìâîëîâ
-function SFSStrEqu (const s0, s1: TSFSString): Boolean;
+// ðàçðåøèòü îñâîáîæäåíèå âðåìåííûõ òîìîâ (ìîæíî âûçûâàòü ðåêóðñèâíî)
+procedure sfsGCEnable ();
+
+// for completeness sake
+procedure sfsGCCollect ();
+
+function SFSReplacePathDelims (const s: AnsiString; newDelim: Char): AnsiString;
 
 // ðàçîáðàòü òîëñòîå èìÿ ôàéëà, âåðíóòü âèðòóàëüíîå èìÿ ïîñëåäíåãî ñïèñêà
 // èëè ïóñòóþ ñòîðîêó, åñëè ñïèñêîâ íå áûëî.
-function SFSGetLastVirtualName (const fn: TSFSString): string;
-
-// ïðåîáðàçîâàòü ÷èñëî â ñòðîêó, êðàñèâî ðàçáàâëÿÿ çàïÿòûìè
-function Int64ToStrComma (i: Int64): string;
+function SFSGetLastVirtualName (const fn: AnsiString): AnsiString;
 
 // Wildcard matching
 // this code is meant to allow wildcard pattern matches. tt is VERY useful
@@ -222,14 +226,9 @@ function Int64ToStrComma (i: Int64): string;
 //       'this [e-n]s a [!zy]est' -Would match 'this is a test', but would
 //                                 not match 'this as a yest'
 //
-function WildMatch (pattern, text: TSFSString): Boolean;
-function WildListMatch (wildList, text: TSFSString; delimChar: AnsiChar=':'): Integer;
-function HasWildcards (const pattern: TSFSString): Boolean;
-
-// this will compare only last path element from sfspath
-function SFSDFPathEqu (sfspath: string; path: string): Boolean;
-
-function SFSUpCase (ch: Char): Char;
+function WildMatch (pattern, text: AnsiString): Boolean;
+function WildListMatch (wildList, text: AnsiString; delimChar: AnsiChar=':'): Integer;
+function HasWildcards (const pattern: AnsiString): Boolean;
 
 
 var
@@ -245,26 +244,13 @@ var
   // òåêóùåì. êàòàëîãè ðàçäåëÿþòñÿ òðóáîé ("|").
   // <currentdir> çàìåíÿåòñÿ íà òåêóùèé êàòàëîã (ñ çàâåðøàþùèì "/"),
   // <exedir> çàìåíÿåòñÿ íà êàòàëîã, ãäå ñèäèò .EXE (ñ çàâåðøàþùèì "/").
-  sfsDiskDirs: TSFSString = '<currentdir>|<exedir>';
+  sfsDiskDirs: AnsiString = '<currentdir>|<exedir>';
 
 
 implementation
 
 uses
-  xstreams;
-
-
-function Int64ToStrComma (i: Int64): string;
-var
-  f: Integer;
-begin
-  Str(i, result);
-  f := Length(result)+1;
-  while f > 4 do
-  begin
-    Dec(f, 3); Insert(',', result, f);
-  end;
-end;
+  xstreams, utils;
 
 
 const
@@ -279,7 +265,7 @@ const
   WILD_CHAR_RANGE_NOT      = '!';
 
 
-function HasWildcards (const pattern: TSFSString): Boolean;
+function HasWildcards (const pattern: AnsiString): Boolean;
 begin
   result :=
     (Pos(WILD_CHAR_ESCAPE, pattern) <> 0) or
@@ -289,7 +275,7 @@ begin
     (Pos(WILD_CHAR_RANGE_OPEN, pattern) <> 0);
 end;
 
-function MatchMask (const pattern: TSFSString; p, pend: Integer; const text: TSFSString; t, tend: Integer): Boolean;
+function MatchMask (const pattern: AnsiString; p, pend: Integer; const text: AnsiString; t, tend: Integer): Boolean;
 var
   rangeStart, rangeEnd: AnsiChar;
   rangeNot, rangeMatched: Boolean;
@@ -377,14 +363,14 @@ begin
 end;
 
 
-function WildMatch (pattern, text: TSFSString): Boolean;
+function WildMatch (pattern, text: AnsiString): Boolean;
 begin
   if pattern <> '' then pattern := AnsiLowerCase(pattern);
   if text <> '' then text := AnsiLowerCase(text);
   result := MatchMask(pattern, 1, -1, text, 1, -1);
 end;
 
-function WildListMatch (wildList, text: TSFSString; delimChar: AnsiChar=':'): Integer;
+function WildListMatch (wildList, text: AnsiString; delimChar: AnsiChar=':'): Integer;
 var
   s, e: Integer;
 begin
@@ -418,7 +404,7 @@ type
   TVolumeInfo = class
     fFactory: TSFSVolumeFactory;
     fVolume: TSFSVolume;
-    fPackName: TSFSString; // äëÿ îäíîãî è òîãî æå ôàéëà áóäåò òîëüêî îäèí òîì!
+    fPackName: AnsiString; // äëÿ îäíîãî è òîãî æå ôàéëà áóäåò òîëüêî îäèí òîì!
     fStream: TStream; // ôàéëîâûé ïîòîê äëÿ ñáîðíèêà
     fPermanent: Boolean; // èñòèíà -- íå áóäåò óãðîáëåíà, åñëè íå îñòàíåòñÿ íè îäíîãî îòêðûòîãî òîìà
     // èñòèíà -- ýòîò òîì áûë ñîçäàí èç ïîòîêà è íå èìååò äèñêîâîãî ôàéëà, ïîòîìó ôàáðèêå áóäåò ïåðåäàíî íå èìÿ ñáîðíèêà, à ïóñòàÿ ñòðîêà
@@ -441,13 +427,70 @@ type
 var
   factories: TObjectList; // TSFSVolumeFactory
   volumes: TObjectList;   // TVolumeInfo
+  gcdisabled: Integer = 0; // >0: disabled
+
+
+procedure sfsGCCollect ();
+var
+  f, c: Integer;
+  vi: TVolumeInfo;
+  used: Boolean;
+begin
+  // collect garbage
+  f := 0;
+  while f < volumes.Count do
+  begin
+    vi := TVolumeInfo(volumes[f]);
+    if vi = nil then continue;
+    if (not vi.fPermanent) and (vi.fOpenedFilesCount = 0) then
+    begin
+      // this volume probably can be removed
+      used := false;
+      c := volumes.Count-1;
+      while not used and (c >= 0) do
+      begin
+        if (c <> f) and (volumes[c] <> nil) then
+        begin
+          used := (TVolumeInfo(volumes[c]).fStream = vi.fStream);
+          if not used then used := (TVolumeInfo(volumes[c]).fVolume.fFileStream = vi.fStream);
+          if used then break;
+        end;
+        Dec(c);
+      end;
+      if not used then
+      begin
+        {$IFDEF SFS_VOLDEBUG}writeln('000: destroying volume "', TVolumeInfo(volumes[f]).fPackName, '"');{$ENDIF}
+        volumes.extract(vi); // remove from list
+        vi.Free; // and kill
+        f := 0;
+        continue;
+      end;
+    end;
+    Inc(f); // next volume
+  end;
+end;
+
+procedure sfsGCDisable ();
+begin
+  Inc(gcdisabled);
+end;
+
+procedure sfsGCEnable ();
+begin
+  Dec(gcdisabled);
+  if gcdisabled <= 0 then
+  begin
+    gcdisabled := 0;
+    sfsGCCollect();
+  end;
+end;
 
 
 // ðàçáèòü èìÿ ôàéëà íà ÷àñòè: ïðåôèêñ ôàéëîâîé ñèñòåìû, èìÿ ôàéëà äàííûõ,
 // ñîáñòâåííî èìÿ ôàéëà
 // èìÿ âûãëÿäèò êàê:
 // (("sfspfx:")?"datafile::")*"filename"
-procedure SplitFName (const fn: string; out dataFile, fileName: string);
+procedure SplitFName (const fn: AnsiString; out dataFile, fileName: AnsiString);
 var
   f: Integer;
 begin
@@ -466,7 +509,7 @@ begin
 end;
 
 // ñàéäýôôåêò: âûðåçàåò âèðòóàëüíîå èìÿ èç dataFile.
-function ExtractVirtName (var dataFile: string): string;
+function ExtractVirtName (var dataFile: AnsiString): AnsiString;
 var
   f: Integer;
 begin
@@ -494,7 +537,7 @@ end;
 // [sfspfx:]datafile[|virtname]
 // åñëè ïåðåä äâîåòî÷èåì ìåíüøå òð¸õ áóêâ, òî ýòî ñ÷èòàåòñÿ íå ïðåôèêñîì,
 // à èìåíåì äèñêà.
-procedure SplitDataName (const fn: string; out pfx, dataFile, virtName: string);
+procedure SplitDataName (const fn: AnsiString; out pfx, dataFile, virtName: AnsiString);
 var
   f: Integer;
 begin
@@ -510,7 +553,7 @@ end;
 
 // íàéòè ïðîèçâîäèòåëÿ äëÿ ýòîãî ôàéëà (åñëè ôàéë óæå îòêðûò).
 // onlyPerm: òîëüêî "ïîñòîÿííûå" ïðîèçâîäèòåëè.
-function FindVolumeInfo (const dataFileName: TSFSString; onlyPerm: Boolean=false): Integer;
+function FindVolumeInfo (const dataFileName: AnsiString; onlyPerm: Boolean=false): Integer;
 var
   f: Integer;
   vi: TVolumeInfo;
@@ -523,7 +566,7 @@ begin
       vi := TVolumeInfo(volumes[f]);
       if not onlyPerm or vi.fPermanent then
       begin
-        if SFSStrEqu(vi.fPackName, dataFileName) then
+        if StrEquCI1251(vi.fPackName, dataFileName) then
         begin
           result := f;
           exit;
@@ -550,65 +593,35 @@ begin
   end;
 end;
 
-function SFSUpCase (ch: Char): Char;
-begin
-  if ch < #128 then
-  begin
-    if (ch >= 'a') and (ch <= 'z') then Dec(ch, 32);
-  end
-  else
-  begin
-    if (ch >= #224) and (ch <= #255) then
-    begin
-      Dec(ch, 32);
-    end
-    else
-    begin
-      case ch of
-        #184, #186, #191: Dec(ch, 16);
-        #162, #179: Dec(ch);
-      end;
-    end;
-  end;
-  result := ch;
-end;
 
-function SFSStrEqu (const s0, s1: TSFSString): Boolean;
+// adds '/' too
+function normalizePath (fn: AnsiString): AnsiString;
 var
   i: Integer;
 begin
-  //result := (AnsiCompareText(s0, s1) == 0);
-  result := false;
-  if length(s0) <> length(s1) then exit;
-  for i := 1 to length(s0) do
+  result := '';
+  i := 1;
+  while i <= length(fn) do
   begin
-    if SFSUpCase(s0[i]) <> SFSUpCase(s1[i]) then exit;
-  end;
-  result := true;
-end;
-
-// this will compare only last path element from sfspath
-function SFSDFPathEqu (sfspath: string; path: string): Boolean;
-{var
-  i: Integer;}
-begin
-  result := SFSStrEqu(sfspath, path);
-(*
-  if not result and (length(sfspath) > 1) then
-  begin
-    i := length(sfspath);
-    while i > 1 do
+    if (fn[i] = '.') and ((length(fn)-i = 0) or (fn[i+1] = '/') or (fn[i+1] = '\')) then
     begin
-      while (i > 1) and (sfspath[i-1] <> '/') do Dec(i);
-      if i <= 1 then exit;
-      writeln('{', sfspath, '} [', Copy(sfspath, i, length(sfspath)), '] : [', path, ']');
-      result := SFSStrEqu(Copy(sfspath, i, length(sfspath)), path);
+      i := i+2;
+      continue;
     end;
+    if (fn[i] = '/') or (fn[i] = '\') then
+    begin
+      if (length(result) > 0) and (result[length(result)] <> '/') then result := result+'/';
+    end
+    else
+    begin
+      result := result+fn[i];
+    end;
+    Inc(i);
   end;
-*)
+  if (length(result) > 0) and (result[length(result)] <> '/') then result := result+'/';
 end;
 
-function SFSReplacePathDelims (const s: TSFSString; newDelim: TSFSChar): TSFSString;
+function SFSReplacePathDelims (const s: AnsiString; newDelim: Char): AnsiString;
 var
   f: Integer;
 begin
@@ -623,9 +636,9 @@ begin
   end;
 end;
 
-function SFSGetLastVirtualName (const fn: TSFSString): string;
+function SFSGetLastVirtualName (const fn: AnsiString): AnsiString;
 var
-  rest, tmp: string;
+  rest, tmp: AnsiString;
   f: Integer;
 begin
   rest := fn;
@@ -644,7 +657,7 @@ var
   used: Boolean; // ôëàæîê çàþçàíîñòè ïîòîêà êåì-òî åù¸
 begin
   if fFactory <> nil then fFactory.Recycle(fVolume);
-  if fVolume <> nil then used := (fVolume.fRC <> 0) else used := false;
+  used := false;
   fVolume := nil;
   fFactory := nil;
   fPackName := '';
@@ -690,10 +703,14 @@ begin
   if fOwner <> nil then
   begin
     Dec(fOwner.fOpenedFilesCount);
-    if not fOwner.fPermanent and (fOwner.fOpenedFilesCount < 1) then
+    if (gcdisabled = 0) and not fOwner.fPermanent and (fOwner.fOpenedFilesCount < 1) then
     begin
       f := volumes.IndexOf(fOwner);
-      if f <> -1 then volumes[f] := nil; // this will destroy the volume
+      if f <> -1 then
+      begin
+        {$IFDEF SFS_VOLDEBUG}writeln('001: destroying volume "', TVolumeInfo(volumes[f]).fPackName, '"');{$ENDIF}
+        volumes[f] := nil; // this will destroy the volume
+      end;
     end;
   end;
 end;
@@ -719,10 +736,9 @@ end;
 
 
 { TSFSVolume }
-constructor TSFSVolume.Create (const pFileName: TSFSString; pSt: TStream);
+constructor TSFSVolume.Create (const pFileName: AnsiString; pSt: TStream);
 begin
   inherited Create();
-  fRC := 0;
   fFileStream := pSt;
   fFileName := pFileName;
   fFiles := TObjectList.Create(true);
@@ -734,58 +750,34 @@ end;
 
 procedure TSFSVolume.DoDirectoryRead ();
 var
-  fl: TStringList; //!!!FIXME! change to list of wide TSFSStrings or so!
-  f, c, n: Integer;
+  f, c: Integer;
   sfi: TSFSFileInfo;
-  tmp, fn, ext: TSFSString;
+  tmp: AnsiString;
 begin
-  fl := nil;
   fFileName := ExpandFileName(SFSReplacePathDelims(fFileName, '/'));
-  try
-    ReadDirectory();
-    fFiles.Pack();
+  ReadDirectory();
+  fFiles.Pack();
 
-    // check for duplicate file names
-    fl := TStringList.Create(); fl.Sorted := true;
-    for f := 0 to fFiles.Count-1 do
+  f := 0;
+  while f < fFiles.Count do
+  begin
+    sfi := TSFSFileInfo(fFiles[f]);
+    // normalize name & path
+    sfi.fPath := SFSReplacePathDelims(sfi.fPath, '/');
+    if (sfi.fPath <> '') and (sfi.fPath[1] = '/') then Delete(sfi.fPath, 1, 1);
+    if (sfi.fPath <> '') and (sfi.fPath[Length(sfi.fPath)] <> '/') then sfi.fPath := sfi.fPath+'/';
+    tmp := SFSReplacePathDelims(sfi.fName, '/');
+    c := Length(tmp); while (c > 0) and (tmp[c] <> '/') do Dec(c);
+    if c > 0 then
     begin
-      sfi := TSFSFileInfo(fFiles[f]);
-
-      // normalize name & path
-      sfi.fPath := SFSReplacePathDelims(sfi.fPath, '/');
-      if (sfi.fPath <> '') and (sfi.fPath[1] = '/') then Delete(sfi.fPath, 1, 1);
-      if (sfi.fPath <> '') and (sfi.fPath[Length(sfi.fPath)] <> '/') then sfi.fPath := sfi.fPath+'/';
-      tmp := SFSReplacePathDelims(sfi.fName, '/');
-      c := Length(tmp); while (c > 0) and (tmp[c] <> '/') do Dec(c);
-      if c > 0 then
-      begin
-        // split path and name
-        Delete(sfi.fName, 1, c); // cut name
-        tmp := Copy(tmp, 1, c);  // get path
-        if tmp = '/' then tmp := ''; // just delimiter; ignore it
-        sfi.fPath := sfi.fPath+tmp;
-      end;
-
-      // check for duplicates
-      if fl.Find(sfi.fPath+sfi.fName, c) then
-      begin
-        n := 0; tmp := sfi.fName;
-        c := Length(tmp); while (c > 0) and (tmp[c] <> '.') do Dec(c);
-        if c < 1 then c := Length(tmp)+1;
-        fn := Copy(tmp, 1, c-1); ext := Copy(tmp, c, Length(tmp));
-        repeat
-          tmp := fn+'_'+IntToStr(n)+ext;
-          if not fl.Find(sfi.fPath+tmp, c) then break;
-          Inc(n);
-        until false;
-        sfi.fName := tmp;
-      end;
-      fl.Add(sfi.fName);
+      // split path and name
+      Delete(sfi.fName, 1, c); // cut name
+      tmp := Copy(tmp, 1, c);  // get path
+      if tmp = '/' then tmp := ''; // just delimiter; ignore it
+      sfi.fPath := sfi.fPath+tmp;
     end;
-    fl.Free();
-  except
-    fl.Free();
-    raise;
+    sfi.fPath := normalizePath(sfi.fPath);
+    if (length(sfi.fPath) = 0) and (length(sfi.fName) = 0) then sfi.Free else Inc(f);
   end;
   removeCommonPath();
 end;
@@ -799,11 +791,10 @@ end;
 
 procedure TSFSVolume.Clear ();
 begin
-  fRC := 0; //FIXME
   fFiles.Clear();
 end;
 
-function TSFSVolume.FindFile (const fPath, fName: TSFSString): Integer;
+function TSFSVolume.FindFile (const fPath, fName: AnsiString): Integer;
 begin
   if fFiles = nil then result := -1
   else
@@ -814,8 +805,8 @@ begin
       Dec(result);
       if fFiles[result] <> nil then
       begin
-        if SFSStrEqu(fPath, TSFSFileInfo(fFiles[result]).fPath) and
-           SFSStrEqu(fName, TSFSFileInfo(fFiles[result]).fName) then exit;
+        if StrEquCI1251(fPath, TSFSFileInfo(fFiles[result]).fPath) and
+           StrEquCI1251(fName, TSFSFileInfo(fFiles[result]).fName) then exit;
       end;
     end;
     result := -1;
@@ -837,9 +828,9 @@ begin
   end;
 end;
 
-function TSFSVolume.OpenFileEx (const fName: TSFSString): TStream;
+function TSFSVolume.OpenFileEx (const fName: AnsiString): TStream;
 var
-  fp, fn: TSFSString;
+  fp, fn: AnsiString;
   f, ls: Integer;
 begin
   fp := fName;
@@ -879,11 +870,13 @@ var
 begin
   f := FindVolumeInfoByVolumeInstance(fVolume);
   ASSERT(f <> -1);
-  if fVolume <> nil then Dec(fVolume.fRC);
   Dec(TVolumeInfo(volumes[f]).fOpenedFilesCount);
   // óáü¸ì çàïèñü, åñëè îíà âðåìåííàÿ, è â íåé íåò áîëüøå íè÷åãî îòêðûòîãî
-  if not TVolumeInfo(volumes[f]).fPermanent and
-     (TVolumeInfo(volumes[f]).fOpenedFilesCount < 1) then volumes[f] := nil;
+  if (gcdisabled = 0) and not TVolumeInfo(volumes[f]).fPermanent and (TVolumeInfo(volumes[f]).fOpenedFilesCount < 1) then
+  begin
+    {$IFDEF SFS_VOLDEBUG}writeln('002: destroying volume "', TVolumeInfo(volumes[f]).fPackName, '"');{$ENDIF}
+    volumes[f] := nil;
+  end;
   inherited Destroy();
 end;
 
@@ -927,7 +920,7 @@ begin
 end;
 
 
-function SFSAddDataFileEx (dataFileName: TSFSString; ds: TStream; top, permanent: Integer): Integer;
+function SFSAddDataFileEx (dataFileName: AnsiString; ds: TStream; top, permanent: Integer): Integer;
 // dataFileName ìîæåò èìåòü ïðåôèêñ òèïà "zip:" (ñì. âûøå: IsMyPrefix).
 // ìîæåò âûêèíóòü èñêëþ÷åíèå!
 // top:
@@ -948,8 +941,8 @@ var
   vi: TVolumeInfo;
   f: Integer;
   st, st1: TStream;
-  pfx: TSFSString;
-  fn, vfn, tmp: TSFSString;
+  pfx: AnsiString;
+  fn, vfn, tmp: AnsiString;
 begin
   f := Pos('::', dataFileName);
   if f <> 0 then
@@ -976,7 +969,7 @@ begin
     except
       FreeAndNil(st);
       // óäàëèì íåèñïîëüçóåìûé âðåìåííûé òîì.
-      if not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[result] := nil;
+      if (gcdisabled = 0) and not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[result] := nil;
       raise;
     end;
     // óðà. îòêðûëè ôàéë. êèäàåì â âîçäóõ ÷åï÷èêè, ïðîäîëæàåì ðàçâëå÷åíèå.
@@ -1007,7 +1000,7 @@ begin
   end;
 
   if ds <> nil then st := ds
-  else st := TFileStream.Create(fn, fmOpenRead or fmShareDenyWrite);
+  else st := TFileStream.Create(fn, fmOpenRead or {fmShareDenyWrite}fmShareDenyNone);
   st.Position := 0;
 
   volumes.Pack();
@@ -1058,8 +1051,7 @@ begin
   vi.fOpenedFilesCount := 0;
 end;
 
-function SFSAddSubDataFile (const virtualName: TSFSString; ds: TStream;
-  top: Boolean = false): Boolean;
+function SFSAddSubDataFile (const virtualName: AnsiString; ds: TStream; top: Boolean=false): Boolean;
 var
   tv: Integer;
 begin
@@ -1073,7 +1065,7 @@ begin
   end;
 end;
 
-function SFSAddDataFile (const dataFileName: TSFSString; top: Boolean = false): Boolean;
+function SFSAddDataFile (const dataFileName: AnsiString; top: Boolean=false): Boolean;
 var
   tv: Integer;
 begin
@@ -1086,11 +1078,25 @@ begin
   end;
 end;
 
+function SFSAddDataFileTemp (const dataFileName: AnsiString; top: Boolean=false): Boolean;
+var
+  tv: Integer;
+begin
+  try
+    if top then tv := -1 else tv := 1;
+    SFSAddDataFileEx(dataFileName, nil, tv, 0);
+    result := true;
+  except
+    result := false;
+  end;
+end;
+
+
 
-function SFSExpandDirName (const s: TSFSString): TSFSString;
+function SFSExpandDirName (const s: AnsiString): AnsiString;
 var
   f, e: Integer;
-  es: TSFSString;
+  es: AnsiString;
 begin
   f := 1; result := s;
   while f < Length(result) do
@@ -1115,9 +1121,9 @@ begin
   end;
 end;
 
-function SFSFileOpenEx (const fName: TSFSString): TStream;
+function SFSFileOpenEx (const fName: AnsiString): TStream;
 var
-  dataFileName, fn: TSFSString;
+  dataFileName, fn: AnsiString;
   f: Integer;
   vi: TVolumeInfo;
   diskChecked: Boolean;
@@ -1126,7 +1132,7 @@ var
   function CheckDisk (): TStream;
   // ïðîâåðèì, åñòü ëè ôàëî fn ãäå-òî íà äèñêàõ.
   var
-    dfn, dirs, cdir: TSFSString;
+    dfn, dirs, cdir: AnsiString;
     f: Integer;
   begin
     result := nil;
@@ -1142,7 +1148,7 @@ var
       cdir := SFSReplacePathDelims(SFSExpandDirName(cdir), '/');
       if cdir[Length(cdir)] <> '/' then cdir := cdir+'/';
       try
-        result := TFileStream.Create(cdir+dfn, fmOpenRead or fmShareDenyWrite);
+        result := TFileStream.Create(cdir+dfn, fmOpenRead or {fmShareDenyWrite}fmShareDenyNone);
         exit;
       except
       end;
@@ -1172,7 +1178,7 @@ begin
       ps := TOwnedPartialStream.Create(vi, result, 0, result.Size, true);
     except
       result.Free();
-      if not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil;
+      if (gcdisabled = 0) and not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil;
       result := CheckDisk(); // îáëîì ñ datafile, ïðîâåðèì äèñê
       if result = nil then raise ESFSError.Create('file not found: "'+fName+'"');
       exit;
@@ -1217,7 +1223,7 @@ begin
   if result = nil then raise ESFSError.Create('file not found: "'+fName+'"');
 end;
 
-function SFSFileOpen (const fName: TSFSString): TStream;
+function SFSFileOpen (const fName: AnsiString): TStream;
 begin
   try
     result := SFSFileOpenEx(fName);
@@ -1226,7 +1232,7 @@ begin
   end;
 end;
 
-function SFSFileList (const dataFileName: TSFSString): TSFSFileList;
+function SFSFileList (const dataFileName: AnsiString): TSFSFileList;
 var
   f: Integer;
   vi: TVolumeInfo;
@@ -1243,9 +1249,8 @@ begin
 
   try
     result := TSFSFileList.Create(vi.fVolume);
-    Inc(vi.fVolume.fRC);
   except
-    if not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil;
+    if (gcdisabled = 0) and not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil;
   end;
 end;
 
@@ -1253,7 +1258,7 @@ end;
 initialization
   factories := TObjectList.Create(true);
   volumes := TObjectList.Create(true);
-finalization
+//finalization
   //volumes.Free(); // it fails for some reason... Runtime 217 (^C hit). wtf?!
   //factories.Free(); // not need to be done actually...
 end.