Build wwutil on Linux (w3dhub#73)

Author: rm5248

Code/wwutil/CMakeLists.txt

@@ -4,7 +4,8 @@ set(WWUTIL_SRC
     mathutil.h
     miscutil.cpp
     miscutil.h
-    stackdump.cpp
+    $<$<BOOL:${WIN32}>:stackdump-windows.cpp>
+    $<$<BOOL:${LINUX}>:stackdump-linux.cpp>
     stackdump.h
 )
 

Code/wwutil/miscutil.cpp

@@ -27,18 +27,18 @@
 #include "miscutil.h" // I WANNA BE FIRST!
 
 #include <time.h>
+#include <cstdio>
 
 #include "rawfile.h"
 #include "wwdebug.h"
-#include <windows.h>
 #include "ffactory.h"
 
 //
 // cMiscUtil statics 
 //
 
 //---------------------------------------------------------------------------
-LPCSTR cMiscUtil::Get_Text_Time(void)
+const char * cMiscUtil::Get_Text_Time(void)
 {
    //
    // Returns a pointer to an internal statically allocated buffer...
@@ -71,7 +71,7 @@ void cMiscUtil::Seconds_To_Hms(float seconds, int & h, int & m, int & s)
 }
 
 //-----------------------------------------------------------------------------
-bool cMiscUtil::Is_String_Same(LPCSTR str1, LPCSTR str2)
+bool cMiscUtil::Is_String_Same(const char * str1, const char * str2)
 {
    WWASSERT(str1 != NULL);
    WWASSERT(str2 != NULL);
@@ -80,7 +80,7 @@ bool cMiscUtil::Is_String_Same(LPCSTR str1, LPCSTR str2)
 }
 
 //-----------------------------------------------------------------------------
-bool cMiscUtil::Is_String_Different(LPCSTR str1, LPCSTR str2)
+bool cMiscUtil::Is_String_Different(const char * str1, const char * str2)
 {
    WWASSERT(str1 != NULL);
    WWASSERT(str2 != NULL);
@@ -89,7 +89,7 @@ bool cMiscUtil::Is_String_Different(LPCSTR str1, LPCSTR str2)
 }
 
 //-----------------------------------------------------------------------------
-bool cMiscUtil::File_Exists(LPCSTR filename)
+bool cMiscUtil::File_Exists(const char * filename)
 {
 #if 0
    WWASSERT(filename != NULL);
@@ -113,15 +113,6 @@ bool cMiscUtil::File_Exists(LPCSTR filename)
 #endif
 }
 
-//-----------------------------------------------------------------------------
-bool cMiscUtil::File_Is_Read_Only(LPCSTR filename)
-{
-   WWASSERT(filename != NULL);
-
-	DWORD attributes = ::GetFileAttributesA(filename);
-	return ((attributes != 0xFFFFFFFF) && (attributes & FILE_ATTRIBUTE_READONLY));
-}
-
 //-----------------------------------------------------------------------------
 bool cMiscUtil::Is_Alphabetic(char c)
 {
@@ -158,68 +149,11 @@ void cMiscUtil::Trim_Trailing_Whitespace(char * text)
 }
 
 //-----------------------------------------------------------------------------
-void cMiscUtil::Get_File_Id_String(LPCSTR filename, StringClass & str)
-{
-	WWASSERT(filename != NULL);
-
-//	WWDEBUG_SAY(("cMiscUtil::Get_File_Id_String for %s\n", filename));
-
-   //
-   // Get size
-   //
-   RawFileClass file(filename);
-   int filesize = file.Size();
-	//WWASSERT(filesize > 0);
-	if (filesize <= 0)
-	{
-		WWDEBUG_SAY(("Error: cMiscUtil::Get_File_Id_String for %s: filesize = %d\n", 
-			filename, filesize));
-		DIE;
-	}
-   file.Close();
-
-	//
-	// Note... this timedatestamp is not present for all file types...
-	//
-	IMAGE_FILE_HEADER header = {0};
-	extern bool Get_Image_File_Header(LPCSTR filename, IMAGE_FILE_HEADER *file_header);
-	/*
-	bool success;
-	success = Get_Image_File_Header(filename, &header);
-	WWASSERT(success);
-	*/
-	Get_Image_File_Header(filename, &header);
-	int time_date_stamp = header.TimeDateStamp;
-
-	char working_filename[500];
-	strcpy(working_filename, filename);
-	::strupr(working_filename);
-
-   //
-   // Strip path off filename
-   //
-   char * p_start = &working_filename[strlen(working_filename)];
-   int num_chars = 1;
-   while (p_start > working_filename && *(p_start - 1) != '\\') {
-      p_start--;
-      num_chars++;
-   }
-   ::memmove(working_filename, p_start, num_chars);
-
-	//
-	// Put all this data into a string
-	//
-	str.Format("%s %d %d", working_filename, filesize, time_date_stamp);
-
-	//WWDEBUG_SAY(("File id string: %s\n", str));
-}
-
-//-----------------------------------------------------------------------------
-void cMiscUtil::Remove_File(LPCSTR filename)
+void cMiscUtil::Remove_File(const char * filename)
 {
    WWASSERT(filename != NULL);
 
-	::DeleteFileA(filename);
+    ::remove(filename);
 }
 
 

Code/wwutil/miscutil.h

@@ -31,31 +31,22 @@
 #ifndef MISCUTIL_H
 #define MISCUTIL_H
 
-#ifndef	ALWAYS_H
-	#include "always.h"
-#endif
-
-#include	"bittype.h"
-#include	"wwstring.h"
-
 const float MISCUTIL_EPSILON = 0.0001f;
 
 class cMiscUtil
 {
 	public:
-		static LPCSTR	Get_Text_Time(void);
+        static const char *	Get_Text_Time(void);
       static void		Seconds_To_Hms(float seconds, int & h, int & m, int & s);
-		static bool		Is_String_Same(LPCSTR str1, LPCSTR str2);
-		static bool		Is_String_Different(LPCSTR str1, LPCSTR str2);
-		static void		Get_File_Id_String(LPCSTR filename, StringClass & str);
-      static bool		File_Exists(LPCSTR filename);
-		static bool		File_Is_Read_Only(LPCSTR filename);
+        static bool		Is_String_Same(const char * str1, const char * str2);
+        static bool		Is_String_Different(const char * str1, const char * str2);
+      static bool		File_Exists(const char * filename);
       static bool		Is_Alphabetic(char c);
       static bool		Is_Numeric(char c);
       static bool		Is_Alphanumeric(char c);
 		static bool		Is_Whitespace(char c);
 		static void		Trim_Trailing_Whitespace(char * text);
-      static void		Remove_File(LPCSTR filename);
+      static void		Remove_File(const char * filename);
 
 	private:
 };

Code/wwutil/stackdump-linux.cpp

@@ -0,0 +1,6 @@
+#include "stackdump.h"
+
+void cStackDump::Print_Call_Stack(void)
+{
+    // do nothing
+}