X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fsfs%2FsfsZipFS.pas;h=7a1852a483234eb17258564015322b3b38a76550;hp=4abd880bd4d659bf2811c49c00c0b904823675a0;hb=844441154d1220d6c83f75043300c2851ec87109;hpb=56fe3537337bec115cae2b73922752488ff298a4 diff --git a/src/sfs/sfsZipFS.pas b/src/sfs/sfsZipFS.pas index 4abd880..7a1852a 100644 --- a/src/sfs/sfsZipFS.pas +++ b/src/sfs/sfsZipFS.pas @@ -61,7 +61,7 @@ type implementation uses - zstream, xstreams; + zstream, xstreams, utils; type @@ -153,7 +153,7 @@ begin for f := 1 to length(s0) do begin if f > length(s1) then begin result := f; exit; end; - if SFSUpCase(s0[f]) <> SFSUpCase(s1[f]) then begin result := f; exit; end; + if UpCase1251(s0[f]) <> UpCase1251(s1[f]) then begin result := f; exit; end; end; result := length(s0); end; @@ -607,13 +607,13 @@ end; function TSFSZipVolumeFactory.IsMyVolumePrefix (const prefix: TSFSString): Boolean; begin result := - SFSStrEqu(prefix, 'zip') or - SFSStrEqu(prefix, 'dfwad') + StrEquCI1251(prefix, 'zip') or + StrEquCI1251(prefix, 'dfwad') {$IFDEF SFS_ZIPFS_FULL} - or SFSStrEqu(prefix, 'jar') or - SFSStrEqu(prefix, 'fout2') or - SFSStrEqu(prefix, 'vtdb') or - SFSStrEqu(prefix, 'wad') + or StrEquCI1251(prefix, 'jar') or + StrEquCI1251(prefix, 'fout2') or + StrEquCI1251(prefix, 'vtdb') or + StrEquCI1251(prefix, 'wad') {$ENDIF} ; end;