diff --git a/src/doomdef.h b/src/doomdef.h index 4c3bed72f..677554b78 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -418,7 +418,7 @@ enum { */ -void I_Error(const char *error, ...) FUNCIERROR; +FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...); /** \brief write a message to stderr (use before I_Quit) for when you need to quit with a msg, but need the return code 0 of I_Quit(); diff --git a/src/filesrch.c b/src/filesrch.c index 27b519edf..088911e54 100644 --- a/src/filesrch.c +++ b/src/filesrch.c @@ -205,6 +205,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want } } + // This folder is excluded if (skipfolder) { continue; @@ -420,9 +421,6 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut) { DIR *dirhandle; struct dirent *dent; -#ifndef _WIN32 - struct stat fsstat; -#endif size_t pos = 0, folderpos = 0, numfolders = 0; char *tempname = NULL; @@ -468,23 +466,16 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut) strcpy(&menupath[menupathindex[menudepthleft]],dent->d_name); -#ifndef _WIN32 - if (stat(menupath, &fsstat) < 0) -#else - // if we wanna follow symlinks we can check with FILE_ATTRIBUTE_REPARSE_POINT - DWORD fileattr = GetFileAttributes(menupath); - if (fileattr == INVALID_FILE_ATTRIBUTES) -#endif + INT32 isdir = pathisdirectory(menupath); + + if (isdir == -1) ; // was the file (re)moved? can't stat it else // is a file or directory { -#ifndef _WIN32 - if (!S_ISDIR(fsstat.st_mode)) // file -#else - if (!(fileattr & FILE_ATTRIBUTE_DIRECTORY)) -#endif + if (isdir == 0) // file { size_t len = strlen(dent->d_name)+1; + if (replayhut) { if (strcasecmp(".lmp", dent->d_name+len-5)) @@ -550,13 +541,9 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut) strcpy(&menupath[menupathindex[menudepthleft]],dent->d_name); -#ifndef _WIN32 - if (stat(menupath, &fsstat) < 0) -#else - // if we wanna follow symlinks we can check with FILE_ATTRIBUTE_REPARSE_POINT - DWORD fileattr = GetFileAttributes(menupath); - if (fileattr == INVALID_FILE_ATTRIBUTES) -#endif + INT32 isdir = pathisdirectory(menupath); + + if (isdir == -1) ; // was the file (re)moved? can't stat it else // is a file or directory { @@ -565,11 +552,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut) UINT8 ext = EXT_FOLDER; UINT8 folder; -#ifndef _WIN32 - if (!S_ISDIR(fsstat.st_mode)) // file -#else - if (!(fileattr & FILE_ATTRIBUTE_DIRECTORY)) -#endif + if (isdir == 0) // file { if (!((numfolders+pos) < sizecoredirmenu)) continue; // crash prevention diff --git a/src/i_system.h b/src/i_system.h index 024d491c7..f5187e037 100644 --- a/src/i_system.h +++ b/src/i_system.h @@ -93,7 +93,7 @@ void I_OsPolling(void); /** \brief Called by M_Responder when quit is selected, return exit code 0 */ -void I_Quit(void) FUNCNORETURN; +FUNCNORETURN void ATTRNORETURN I_Quit(void); /** \brief to set up the first joystick scale diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index af730ced6..97d9b27b4 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1917,7 +1917,7 @@ INT32 I_StartupSystem(void) // // I_Quit // -void I_Quit(void) +FUNCNORETURN void ATTRNORETURN I_Quit(void) { static SDL_bool quiting = SDL_FALSE; @@ -1981,7 +1981,7 @@ static INT32 errorcount = 0; */ static boolean shutdowning = false; -void I_Error(const char *error, ...) +FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...) { va_list argptr; char buffer[8192]; diff --git a/src/w_wad.c b/src/w_wad.c index 623efe118..4a993a7f4 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -353,7 +353,7 @@ static inline INT32 W_MakeFileMD5(const char *filename, void *resblock) // Invalidates the cache of lump numbers. Call this whenever a wad is added. static void W_InvalidateLumpnumCache(void) { - memset(lumpnumcache, 0, sizeof (lumpnumcache)); + memset(lumpnumcache, 0, sizeof(lumpnumcache)); } UINT32 W_HashLumpName(const char *name) @@ -383,12 +383,10 @@ static restype_t ResourceFileDetect(const char* filename) static lumpinfo_t* ResGetLumpsStandalone(FILE* handle, UINT16* numlumps, const char* lumpname) { lumpinfo_t* lumpinfo = Z_Calloc(sizeof (*lumpinfo), PU_STATIC, NULL); - lumpinfo->position = 0; fseek(handle, 0, SEEK_END); lumpinfo->size = ftell(handle); fseek(handle, 0, SEEK_SET); - strlcpy(lumpinfo->name, lumpname, sizeof(lumpinfo->name)); lumpinfo->namelength = strlen(lumpinfo->name); lumpinfo->hash.name = W_HashLumpName(lumpname); @@ -863,7 +861,9 @@ UINT16 W_InitFile(const char *filename, boolean local, boolean startup) } #endif - switch(type = ResourceFileDetect(filename)) + type = ResourceFileDetect(filename); + + switch (type) { case RET_SOC: lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "OBJCTCFG"); @@ -950,9 +950,10 @@ UINT16 W_InitFile(const char *filename, boolean local, boolean startup) if (refreshdirmenu & REFRESHDIR_GAMEDATA) G_LoadGameData(); - DEH_UpdateMaxFreeslots(); + DEH_UpdateMaxFreeslots(); W_InvalidateLumpnumCache(); + return wadfile->numlumps; } @@ -1059,14 +1060,14 @@ const char *W_CheckNameForNum(lumpnum_t lumpnum) UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump) { UINT16 i; - static char uname[9]; + static char uname[8 + 1]; UINT32 hash; size_t namelen; if (!TestValidLump(wad, 0)) return INT16_MAX; - memset(uname, 0, sizeof uname); + memset(uname, 0, sizeof(uname)); strncpy(uname, name, sizeof(uname)-1); strupr(uname); namelen = strlen(uname); @@ -1134,7 +1135,7 @@ UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump) return INT16_MAX; } -UINT16 W_CheckNumForMarkerStartPwad (const char *name, UINT16 wad, UINT16 startlump) +UINT16 W_CheckNumForMarkerStartPwad(const char *name, UINT16 wad, UINT16 startlump) { UINT16 marker; marker = W_CheckNumForNamePwad(name, wad, startlump); @@ -1305,7 +1306,7 @@ lumpnum_t W_CheckNumForName(const char *name) else { // Update the cache. - lumpnum_t lumpnum = (i << 16) + check; + lumpnum_t lumpnum = (i << 16) | check; AddLumpToCache(lumpnum, name, false); return lumpnum; @@ -1331,16 +1332,13 @@ lumpnum_t W_CheckNumForLongName(const char *name) if (cachenum != LUMPERROR) return cachenum; - if (check == INT16_MAX) + // scan wad files backwards so patch lump files take precedence + for (i = numwadfiles - 1; i >= 0; i--) { - // scan wad files backwards so patch lump files take precedence - for (i = numwadfiles - 1; i >= 0; i--) - { - check = W_CheckNumForLongNamePwad(name, (UINT16)i, 0); + check = W_CheckNumForLongNamePwad(name, (UINT16)i, 0); - if (check != INT16_MAX) - break; //found it - } + if (check != INT16_MAX) + break; //found it } if (check == INT16_MAX) @@ -1350,7 +1348,7 @@ lumpnum_t W_CheckNumForLongName(const char *name) else { // Update the cache. - lumpnum_t lumpnum = (i << 16) + check; + lumpnum_t lumpnum = (i << 16) | check; AddLumpToCache(lumpnum, name, true); return lumpnum; @@ -1878,16 +1876,15 @@ void *W_CacheSoftwarePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag) if (!lumpcache[lump]) { size_t len = W_LumpLengthPwad(wad, lump); - void *ptr, *dest, *lumpdata = Z_Malloc(len, PU_STATIC, NULL); + void *dest, *lumpdata = Z_Malloc(len, PU_STATIC, NULL); // read the lump in full W_ReadLumpHeaderPwad(wad, lump, lumpdata, 0, 0); - ptr = lumpdata; dest = Z_Calloc(sizeof(patch_t), tag, &lumpcache[lump]); - Patch_Create((softwarepatch_t*)(ptr), len, dest); + Patch_Create((softwarepatch_t*)lumpdata, len, dest); - Z_Free(ptr); + Z_Free(lumpdata); } else Z_ChangeTag(lumpcache[lump], tag); @@ -1909,9 +1906,12 @@ void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag) patch = (patch_t *)W_CacheSoftwarePatchNumPwad(wad, lump, tag); + if (patch == NULL) + return NULL; + #ifdef HWRENDER // Software-only compile cache the data without conversion - if (patch != NULL && rendermode == render_opengl) + if (rendermode == render_opengl) Patch_CreateGL(patch); #endif @@ -2093,8 +2093,7 @@ void W_VerifyFileMD5(UINT16 wadfilenum, const char *matchmd5) // formats. checklist assumed to be valid. static int W_VerifyName(const char *name, lumpchecklist_t *checklist, boolean status) { - size_t j; - for (j = 0; checklist[j].len && checklist[j].name; ++j) + for (size_t j = 0; checklist[j].len && checklist[j].name; ++j) { if ((strncasecmp(name, checklist[j].name, checklist[j].len) != false) == status) @@ -2102,6 +2101,7 @@ static int W_VerifyName(const char *name, lumpchecklist_t *checklist, boolean st return true; } } + return false; } @@ -2363,13 +2363,7 @@ int W_VerifyNMUSlumps(const char *filename, FILE *handle, boolean exit_on_error) static int W_NameStartsWith(const char *name, lumpchecklist_t *checklist) { - size_t j; - for (j = 0; checklist[j].len && checklist[j].name; ++j) - { - if (strncasecmp(name, checklist[j].name, checklist[j].len) == 0) - return true; - } - return false; + return W_VerifyName(name, checklist, false); } // Checks if file contains at least one lump which name starts with one of strings in checklist