diff --git a/src/shared/utils.pas b/src/shared/utils.pas
index 867f0dcbef1befffb33b7d3a66cc40b57eeb360e..a3a650070a1ff1ef05791ee85676edd231259dd1 100644 (file)
--- a/src/shared/utils.pas
+++ b/src/shared/utils.pas
SSArray = array of ShortString;
+const wadExtensions: array [0..6] of AnsiString = (
+ '.dfz',
+ '.wad',
+ '.dfwad',
+ '.pk3',
+ '.pak',
+ '.zip',
+ '.dfzip'
+);
+
+
// ////////////////////////////////////////////////////////////////////////// //
type
TUtf8DecoderFast = packed record
function upcase1251 (ch: AnsiChar): AnsiChar; inline;
function locase1251 (ch: AnsiChar): AnsiChar; inline;
+function IsValid1251 (ch: Word): Boolean;
+function IsPrintable1251 (ch: AnsiChar): Boolean;
function toLowerCase1251 (const s: AnsiString): AnsiString;
function utf8to1251 (s: AnsiString): AnsiString;
-// `pathname` will be modified if path is valid
-// `lastIsDir` should be `true` if we are searching for directory
-// nobody cares about shitdoze, so i'll use the same code path for it
+// findFileCI takes case-insensitive path, traverses it, and rewrites it to
+// a case-sensetive one (using real on-disk names). return value means 'success'.
+// if some dir or file wasn't found, pathname is undefined (destroyed, but not
+// necessarily cleared).
+// last name assumed to be a file, not directory (unless `lastIsDir` flag is set).
function findFileCI (var pathname: AnsiString; lastIsDir: Boolean=false): Boolean;
-// return fixed AnsiString or empty AnsiString
+// findDiskWad tries to find the wad file using common wad extensions
+// (see `wadExtensions` array).
+// returns real on-disk filename, or empty string.
+// original wad extension is used as a hint for the first try.
+// also, this automatically performs `findFileCI()`.
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
+// create file if necessary, but don't truncate the existing one
function openDiskFileRW (pathname: AnsiString): TStream;
// little endian
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;
begin
result := ch;
end;
+function IsValid1251 (ch: Word): Boolean;
+begin
+ result := (ch = Ord('?')) or (wc2shitmap[ch] <> '?')
+end;
+
+function IsPrintable1251 (ch: AnsiChar): Boolean;
+begin
+ result := (ch >= #32) and (ch <> #127)
+end;
+
function strEquCI1251 (const s0, s1: AnsiString): Boolean;
var
// ////////////////////////////////////////////////////////////////////////// //
-// `pathname` will be modified if path is valid
-// `lastIsDir` should be `true` if we are searching for directory
-// nobody cares about shitdoze, so i'll use the same code path for it
+// findFileCI eats case-insensitive path, traverses it and rewrites it to a
+// case-sensetive. result value means success.
+// if file/dir not founded than pathname is in undefined state!
function findFileCI (var pathname: AnsiString; lastIsDir: Boolean=false): Boolean;
var
sr: TSearchRec;