W_VerifyNMUSlumps: Clean up

- Bake W_VerifyFile in, since it was a stub never called anywhere else
- Make it operate off file handles, since the following locations quickly filesearch'd more than once in quick succession.
    - W_InitFile
    - Command_Addfile
- Remove spurious call from W_InitMultipleFiles for `-file` startup param
This commit is contained in:
toaster authored and Alug committed 2025-09-12 04:44:27 +02:00
1 parent f7120ec7a5
commit a8a7fc16de
4 files changed
+85 -63

No files matched your search

+14 -6
View File
@@ -1398,16 +1398,24 @@ static void IdentifyVersion(void)
#if !defined (HAVE_SDL) || defined (HAVE_MIXER)
#define MUSICTEST(str) \
musicpath = va(pandf,srb2waddir,str);\
handle = W_OpenWadFile(&musicpath, false); \
if (handle) \
{\
const char *musicpath = va(pandf,srb2waddir,str);\
int ms = W_VerifyNMUSlumps(musicpath); \
int ms = W_VerifyNMUSlumps(musicpath, handle, false); \
fclose(handle); \
if (ms == 0) \
I_Error("File " str " has been modified with non-music/sound lumps"); \
if (ms == 1) \
D_AddFile(musicpath, startupwadfiles); \
else if (ms == 0) \
I_Error("File "str" has been modified with non-music/sound lumps"); \
}
MUSICTEST("sounds.kart")
MUSICTEST("music.kart")
{
const char *musicpath;
FILE *handle;
MUSICTEST("sounds.kart")
MUSICTEST("music.kart")
}
#undef MUSICTEST
#endif
}
+25 -15
View File
@@ -4408,7 +4408,9 @@ static void Command_Addfile(void)
char buf[256];
char *buf_p = buf;
INT32 i;
int musiconly; // W_VerifyNMUSlumps isn't boolean
int musiconly = -1; // W_VerifyNMUSlumps isn't boolean
FILE *fhandle = NULL;
if (COM_Argc() != 2)
{
@@ -4423,9 +4425,18 @@ static void Command_Addfile(void)
if (!isprint(fn[i]) || fn[i] == ';')
return;
musiconly = W_VerifyNMUSlumps(fn);
if (fhandle)
{
fclose(fhandle);
fhandle = NULL;
}
if (!musiconly)
if ((fhandle = W_OpenWadFile(&fn, true)) != NULL)
{
musiconly = W_VerifyNMUSlumps(fn, fhandle, false);
}
if (musiconly == -1)
{
// ... But only so long as they contain nothing more then music and sprites.
if (netgame && !(server || IsPlayerAdmin(consoleplayer)))
@@ -4449,36 +4460,31 @@ static void Command_Addfile(void)
break;
++p;
WRITESTRINGN(buf_p,p,240);
// calculate and check md5
{
UINT8 md5sum[16];
#ifdef NOMD5
memset(md5sum,0,16);
#else
FILE *fhandle;
if ((fhandle = W_OpenWadFile(&fn, true)) != NULL)
{
tic_t t = I_GetTime();
CONS_Debug(DBG_SETUP, "Making MD5 for %s\n",fn);
md5_stream(fhandle, md5sum);
CONS_Debug(DBG_SETUP, "MD5 calc for %s took %f second\n", fn, (float)(I_GetTime() - t)/TICRATE);
fclose(fhandle);
}
else // file not found
return;
for (i = 0; i < numwadfiles; i++)
{
if (!memcmp(wadfiles[i]->md5sum, md5sum, 16))
{
CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), fn);
return;
}
if (memcmp(wadfiles[i]->md5sum, md5sum, 16))
continue;
CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), fn);
goto addfile_finally;
}
#endif
// Finally okay to write this important data
WRITESTRINGN(buf_p,p,240);
WRITEMEM(buf_p, md5sum, 16);
}
@@ -4486,6 +4492,10 @@ static void Command_Addfile(void)
SendNetXCmd(XD_REQADDFILE, buf, buf_p - buf);
else
SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
addfile_finally:
if (fhandle)
fclose(fhandle);
}
/** Adds something at runtime.
+45 -41
View File
@@ -743,6 +743,22 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
return lumpinfo;
}
static UINT16 W_InitFileError (const char *filename, boolean exitworthy)
{
if (exitworthy)
{
#ifdef _DEBUG
CONS_Error(va("%s was not found or not valid.\nCheck the log for more details.\n", filename));
#else
I_Error("%s was not found or not valid.\nCheck the log for more details.\n", filename);
#endif
}
else
CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), filename);
return INT16_MAX;
}
// Allocate a wadfile, setup the lumpinfo (directory) and
// lumpcache, add the wadfile to the current active wadfiles
//
@@ -788,14 +804,14 @@ UINT16 W_InitFile(const char *filename, boolean local)
{
CONS_Alert(CONS_ERROR, M_GetText("Maximum wad files reached\n"));
refreshdirmenu |= REFRESHDIR_MAX;
return INT16_MAX;
return W_InitFileError(filename, false); // startup
}
// open wad file
if ((handle = W_OpenWadFile(&filename, true)) == NULL)
return INT16_MAX;
return W_InitFileError(filename, false); // startup
important = !local && !W_VerifyNMUSlumps(filename);
important = !local && !W_VerifyNMUSlumps(filename, handle, false); // startup
#ifndef NOMD5
//
@@ -812,7 +828,7 @@ UINT16 W_InitFile(const char *filename, boolean local)
CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename);
if (handle)
fclose(handle);
return INT16_MAX;
return W_InitFileError(filename, false);
}
}
#endif
@@ -838,7 +854,7 @@ UINT16 W_InitFile(const char *filename, boolean local)
if (lumpinfo == NULL)
{
fclose(handle);
return INT16_MAX;
return W_InitFileError(filename, false); // startup
}
//
@@ -926,11 +942,13 @@ INT32 W_InitMultipleFiles(char **filenames, boolean addons)
INT32 rc = 1;
INT32 overallrc = 1;
(void)addons;
// will be realloced as lumps are added
for (; *filenames; filenames++)
{
if (addons && !W_VerifyNMUSlumps(*filenames))
G_SetGameModified(true, false);
// Previously, W_VerifyNMUSlumps was called to mark game modified
// for addons... but W_InitFile already does exactly that!
//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
rc = W_InitFile(*filenames, false);
@@ -2240,38 +2258,6 @@ static int W_VerifyPK3(FILE *fp, lumpchecklist_t *checklist, boolean status)
}
}
// Note: This never opens lumps themselves and therefore doesn't have to
// deal with compressed lumps.
static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
boolean status)
{
FILE *handle;
int goodfile = false;
if (!checklist)
I_Error("No checklist for %s\n", filename);
// open wad file
if ((handle = W_OpenWadFile(&filename, false)) == NULL)
return -1;
if (stricmp(&filename[strlen(filename) - 4], ".pk3") == 0)
goodfile = W_VerifyPK3(handle, checklist, status);
else
{
// detect wad file by the absence of the other supported extensions
if (stricmp(&filename[strlen(filename) - 4], ".soc")
&& stricmp(&filename[strlen(filename) - 4], ".lua"))
{
goodfile = W_VerifyWAD(handle, checklist, status);
}
}
fclose(handle);
return goodfile;
}
/** Checks a wad for lumps other than music and sound.
* Used during game load to verify music.dta is a good file and during a
* netgame join (on the server side) to see if a wad is important enough to
@@ -2283,7 +2269,7 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
* file exists with that filename
* \author Alam Arias
*/
int W_VerifyNMUSlumps(const char *filename)
int W_VerifyNMUSlumps(const char *filename, FILE *handle, boolean exit_on_error)
{
lumpchecklist_t NMUSlist[] =
{
@@ -2320,7 +2306,25 @@ int W_VerifyNMUSlumps(const char *filename)
#endif
{NULL, 0},
};
return W_VerifyFile(filename, NMUSlist, false);
int status = 0;
if (stricmp(&filename[strlen(filename) - 4], ".pk3") == 0)
status = W_VerifyPK3(handle, NMUSlist, false);
else
{
// detect wad file by the absence of the other supported extensions
if (stricmp(&filename[strlen(filename) - 4], ".soc")
&& stricmp(&filename[strlen(filename) - 4], ".lua"))
{
status = W_VerifyWAD(handle, NMUSlist, false);
}
}
if (status == -1)
W_InitFileError(filename, exit_on_error);
return status;
}
static int W_NameStartsWith(const char *name, lumpchecklist_t *checklist)
+1 -1
View File
@@ -249,7 +249,7 @@ void W_UnlockCachedPatch(void *patch);
void W_VerifyFileMD5(UINT16 wadfilenum, const char *matchmd5);
int W_VerifyNMUSlumps(const char *filename);
int W_VerifyNMUSlumps(const char *filename, FILE *handle, boolean exit_on_error);
int W_CheckPostLoadList(const char *filename);