utils\common: Add changes from recent TF2 SDK

Author: dimhotepus

utils/common/bsplib.cpp

@@ -2286,6 +2286,12 @@ bool LoadBSPFile( const char *filename )
 	CopyLump( header, FIELD_CHARACTER, LUMP_TEXDATA_STRING_DATA, g_TexDataStringData );
 	CopyLump( header, FIELD_INTEGER, LUMP_TEXDATA_STRING_TABLE, g_TexDataStringTable );
 
+	// It's assumed by other code that the data lump is filled with C strings. We need to make sure that 
+	// the buffer as a whole ends with a '\0'.
+	// dimhotepus: TF2 backport.
+	if ( g_TexDataStringData.Count() > 0 && g_TexDataStringData.Tail() != '\0' )
+		Error( "BSP file %s is corrupted", filename );
+	
 	g_nOverlayCount = CopyLump(header, LUMP_OVERLAYS, g_Overlays);
 	g_nWaterOverlayCount = CopyLump( header, LUMP_WATEROVERLAYS, g_WaterOverlays );
 	CopyLump( header, LUMP_OVERLAY_FADES, g_OverlayFades );
@@ -3123,7 +3129,8 @@ Generates the dentdata string from all the entities
 void UnparseEntities (void)
 {
 	epair_t	*ep;
-	char	line[2048];
+	// dimhotepus: +16 is from TF2 backport.
+	char	line[2048 + 16];
 	int		i;
 	char	key[1020], value[1020];
 

utils/common/cmdlib.cpp

@@ -458,8 +458,8 @@ void Q_mkdir(char *path) {
   if (!mkdir(path, 0777) || errno == EEXIST) return;
 #endif
 
-  Error( "Unable to create directory '%s': %s.\n",
-      path, std::generic_category().message(errno).c_str() );
+  Error("Unable to create directory '%s': %s.\n", path,
+        std::generic_category().message(errno).c_str());
 }
 
 void CmdLib_InitFileSystem(const char *pFilename, int maxMemoryUsage) {
@@ -545,9 +545,9 @@ bool CmdLib_HasBasePath(const char *pFileName_, intp &pathLength) {
 
   for (intp i = 0; i < g_NumBasePaths; i++) {
     // see if we can rip the base off of the filename.
-    if (Q_strncasecmp(g_pBasePaths[i], pFileName, strlen(g_pBasePaths[i])) ==
-        0) {
-      pathLength = strlen(g_pBasePaths[i]);
+    const intp len = V_strlen(g_pBasePaths[i]);
+    if (Q_strncasecmp(g_pBasePaths[i], pFileName, len) == 0) {
+      pathLength = len;
       return true;
     }
   }
@@ -718,7 +718,7 @@ void CreatePath(char *path) {
 }
 
 #if defined(_WIN32) || defined(WIN32)
-// Creates a path, path may already exist
+// Creates a path, path may already exist. This is kinda janky, avoid.
 void SafeCreatePath(char *path) {
   char *ptr;
 
@@ -738,6 +738,24 @@ void SafeCreatePath(char *path) {
     }
   }
 }
+#elif defined(POSIX)
+// dimhotepus: TF2 backport.
+void SafeCreatePath(char *path) {
+  char *ptr = path;
+  // Ignore leading slashes (don't mkdir /)
+  while (*ptr == '/') {
+    ptr++;
+  };
+
+  while (ptr && *ptr) {
+    ptr = strchr(ptr + 1, '/');
+    if (ptr) {
+      *ptr = '\0';
+      Q_mkdir(path);
+      *ptr = '/';
+    }
+  }
+}
 #endif
 
 // Used to archive source files

utils/common/scriplib.cpp

@@ -312,7 +312,7 @@ bool ExpandMacroToken( char *&token_p )
 		}
 
 		// paste token into 
-		len = strlen( script->macrovalue[index] );
+		len = V_strlen( script->macrovalue[index] );
 		strcpy( token_p, script->macrovalue[index] );
 		token_p += len;
 
@@ -949,7 +949,7 @@ class CScriptLib final : public IScriptLib
 	bool ReadFileToBuffer( const char *pSourceName, CUtlBuffer &buffer, bool bText = false, bool bNoOpenFailureWarning = false ) override;
 	bool WriteBufferToFile( const char *pTargetName, CUtlBuffer &buffer, DiskWriteMode_t writeMode ) override;
 	intp FindFiles( char* pFileMask, bool bRecurse, CUtlVector<fileList_t> &fileList ) override;
-	char *MakeTemporaryFilename( char const *pchModPath, char *pPath, intp pathSize ) override;
+	[[deprecated]] char *MakeTemporaryFilename( char const *pchModPath, char *pPath, intp pathSize ) override;
 	void DeleteTemporaryFiles( const char *pFileMask ) override;
 	int CompareFileTime( const char *pFilenameA, const char *pFilenameB ) override;
 	bool DoesFileExist( const char *pFilename ) override;
@@ -1081,8 +1081,9 @@ int CScriptLib::CompareFileTime( const char *pFilenameA, const char *pFilenameB
 //-----------------------------------------------------------------------------
 // Make a temporary filename
 //-----------------------------------------------------------------------------
-char *CScriptLib::MakeTemporaryFilename( char const *pchModPath, char *pPath, intp pathSize )
+[[deprecated]] char *CScriptLib::MakeTemporaryFilename( char const *pchModPath, char *pPath, intp pathSize )
 {
+#if 0
 	char *pBuffer = _tempnam( pchModPath, "mgd_" );
 	if ( pBuffer[0] == '\\' )
 	{
@@ -1099,6 +1100,11 @@ char *CScriptLib::MakeTemporaryFilename( char const *pchModPath, char *pPath, in
 	free( pBuffer );
 
 	return pPath;
+#else
+	AssertMsg( false, "Deprecated MakeTemporaryFilename." );
+
+	return nullptr;
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -1213,7 +1219,7 @@ intp CScriptLib::GetFileList( const char* pDirPath, const char* pPattern, CUtlVe
 	FIND_DATA findData;
 	Q_FixSlashes( fullPath );
 	void *h = FindFirstFile( fullPath, &findData );
-	if ( (int)h == -1 )
+	if ( (intp)h == -1 )
 	{
 		return 0;
 	}

utils/common/scriplib.h

@@ -87,7 +87,7 @@ class IScriptLib
 	virtual bool ReadFileToBuffer( const char *pSourceName, CUtlBuffer &buffer, bool bText = false, bool bNoOpenFailureWarning = false ) = 0;
 	virtual bool WriteBufferToFile( const char *pTargetName, CUtlBuffer &buffer, DiskWriteMode_t writeMode ) = 0;
 	virtual intp FindFiles( char* pFileMask, bool bRecurse, CUtlVector<fileList_t> &fileList ) = 0;
-	virtual char *MakeTemporaryFilename( char const *pchModPath, char *pPath, intp pathSize ) = 0;
+	[[deprecated]] virtual char *MakeTemporaryFilename( char const *pchModPath, char *pPath, intp pathSize ) = 0;
 	virtual void DeleteTemporaryFiles( const char *pFileMask ) = 0;
 	virtual int CompareFileTime( const char *pFilenameA, const char *pFilenameB ) = 0;
 	virtual bool DoesFileExist( const char *pFilename ) = 0;