diff --git a/src/shared/utils.pas b/src/shared/utils.pas
index 09c03548a45b04a5bc8809e820fa9ec8b7aebcd2..5ef58845df0057b088866ef616bbf1e1f6b3ebcf 100644 (file)
--- a/src/shared/utils.pas
+++ b/src/shared/utils.pas
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
// adds ".wad" extension if filename doesn't have one of ".wad", ".pk3", ".zip"
function addWadExtension (const fn: AnsiString): AnsiString;
+// check wad signature
+function isWadData (data: Pointer; len: LongWord): Boolean;
+
// convert number to strig with nice commas
function int64ToStrComma (i: Int64): AnsiString;
@@ -102,10 +104,14 @@ function findFileCI (var pathname: AnsiString; lastIsDir: Boolean=false): Boolea
// return fixed AnsiString or empty AnsiString
function findDiskWad (fname: AnsiString): AnsiString;
+// slashes must be normalized!
+function isWadNamesEqu (wna, wnb: AnsiString): Boolean;
// they throws
function openDiskFileRO (pathname: AnsiString): TStream;
function createDiskFile (pathname: AnsiString): TStream;
+// creates file if necessary
+function openDiskFileRW (pathname: AnsiString): TStream;
// little endian
procedure writeSign (st: TStream; const sign: AnsiString);
uses
xstreams;
+const wadExtensions: array [0..6] of AnsiString = (
+ '.dfz',
+ '.wad',
+ '.dfwad',
+ '.pk3',
+ '.pak',
+ '.zip',
+ '.dfzip'
+);
+
// ////////////////////////////////////////////////////////////////////////// //
procedure CopyMemory (Dest: Pointer; Src: Pointer; Len: LongWord); inline;
function hasWadExtension (const fn: AnsiString): Boolean;
var
- ext: AnsiString;
+ ext, newExt: AnsiString;
begin
ext := getFilenameExt(fn);
- result := StrEquCI1251(ext, '.wad') or StrEquCI1251(ext, '.pk3') or StrEquCI1251(ext, '.zip');
+ result := true;
+ for newExt in wadExtensions do if (StrEquCI1251(ext, newExt)) then exit;
+ result := false;
+ //result := StrEquCI1251(ext, '.wad') or StrEquCI1251(ext, '.pk3') or StrEquCI1251(ext, '.zip') or StrEquCI1251(ext, '.dfz');
end;
end;
+function isWadData (data: Pointer; len: LongWord): Boolean;
+ var p: PChar;
+begin
+ p := PChar(data);
+ Result :=
+ (* ZIP *)
+ ((len > 3) and (p[0] = 'P') and (p[1] = 'K') and (p[2] = #03) and (p[3] = #04)) or
+ ((len > 3) and (p[0] = 'P') and (p[1] = 'K') and (p[2] = #05) and (p[3] = #06)) or
+ (* PACK *)
+ ((len > 3) and (p[0] = 'P') and (p[1] = 'A') and (p[2] = 'C') and (p[3] = 'K')) or
+ ((len > 3) and (p[0] = 'S') and (p[1] = 'P') and (p[2] = 'A') and (p[3] = 'K')) or
+ (* DFWAD *)
+ ((len > 5) and (p[0] = 'D') and (p[1] = 'F') and (p[2] = 'W') and (p[3] = 'A') and (p[4] = 'D') and (p[5] = #01))
+end;
+
+
function isWadPath (const fn: AnsiString): Boolean;
var
pos: Integer;
if (pos-4 > 1) and (fn[pos-4] = '.') and ((fn[pos+1] = '\') or (fn[pos+1] = '/')) then
begin
s := Copy(fn, pos-4, 4);
- if StrEquCI1251(s, '.wad') or StrEquCI1251(s, '.pk3') or StrEquCI1251(s, '.zip') then
+ if StrEquCI1251(s, '.wad') or StrEquCI1251(s, '.pk3') or StrEquCI1251(s, '.zip') or StrEquCI1251(s, '.dfz') then
begin
result := true;
exit;
end;
-const fileExtensions: array [0..5] of AnsiString = ('.wad', '.dfzip', '.dfwad', '.pk3', '.pak', '.zip');
+function isWadNamesEqu (wna, wnb: AnsiString): Boolean;
+var
+ ext, newExt: AnsiString;
+ found: Boolean;
+begin
+ result := StrEquCI1251(wna, wnb);
+ if result then exit;
+ // check first ext
+ ext := getFilenameExt(wna);
+ found := false;
+ for newExt in wadExtensions do if (StrEquCI1251(ext, newExt)) then begin found := true; break; end;
+ if not found then exit;
+ // check second ext
+ ext := getFilenameExt(wnb);
+ found := false;
+ for newExt in wadExtensions do if (StrEquCI1251(ext, newExt)) then begin found := true; break; end;
+ if not found then exit;
+ wna := forceFilenameExt(wna, '');
+ wnb := forceFilenameExt(wnb, '');
+ result := StrEquCI1251(wna, wnb);
+end;
function findDiskWad (fname: AnsiString): AnsiString;
var
origExt := getFilenameExt(fname);
fname := forceFilenameExt(fname, '');
//writeln(' findDiskWad01: fname=<', fname, '>; origExt=<', origExt, '>');
- for newExt in fileExtensions do
+ for newExt in wadExtensions do
begin
//writeln(' findDiskWad02: fname=<', fname, '>; origExt=<', origExt, '>; newExt=<', newExt, '>');
if (StrEquCI1251(newExt, origExt)) then
function openDiskFileRO (pathname: AnsiString): TStream;
begin
- if not findFileCI(pathname) then raise Exception.Create('can''t open file "'+pathname+'"');
+ if not findFileCI(pathname) then raise EFileNotFoundException.Create('can''t open file "'+pathname+'"');
result := TFileStream.Create(pathname, fmOpenRead or {fmShareDenyWrite}fmShareDenyNone);
end;
end;
+function openDiskFileRW (pathname: AnsiString): TStream;
+var
+ path: AnsiString;
+ oldname: AnsiString;
+begin
+ //writeln('*** TRYING R/W FILE "', pathname, '"');
+ path := ExtractFilePath(pathname);
+ if length(path) > 0 then
+ begin
+ if not findFileCI(path, true) then raise Exception.Create('can''t create file "'+pathname+'"');
+ end;
+ oldname := pathname;
+ if findFileCI(oldname) then
+ begin
+ //writeln('*** found old file "', oldname, '"');
+ result := TFileStream.Create(oldname, fmOpenReadWrite or fmShareDenyWrite);
+ end
+ else
+ begin
+ result := TFileStream.Create(path+ExtractFileName(pathname), fmCreate);
+ end;
+end;
+
+
procedure writeIntegerLE (st: TStream; vp: Pointer; size: Integer);
{$IFDEF ENDIAN_LITTLE}
begin