Added sysinfo (System Information) functionalities

- More informative messages are displayed during startup, to make it
  easier to identify what system and environment Hercules is running.
- Git/SVN revision detection is improved, separating the source version
  (cached at compile time) from the runtime version, in case the user
  updated their working copy without recompiling the server. Git
  version detection is also more reliable, in case a non-default branch
  is used.
- The get_revision script command has been removed (as it was useless
  to begin with, after the switch to git). An alternative will be
  provided later, for feature-probing purposes.
- The patch was tested under Linux (Gentoo / gcc 4.7 on i686 and x86_64,
  Debian 6 / gcc 4.4 on i686, Raspbian / gcc 4.6 on armv6l, CentOS 5 /
  gcc 4.1 on i686, CentOS 6 / gcc 4.4 on x86_64, Linux Mint 15 / gcc 4.7
  on x86_64, OS X Mountain Lion / clang 5.0 and gcc 4.8 on x86_64,
  Cygwin-NT-5.1/gcc 4.8 on i686, FreeBSD 8 / gcc 4.2 on i386, FreeBSD 9
  / gcc 4.2 on amd64, FreeBSD 10 / clang 3.3 on amd64, NetBSD 5 / gcc
  4.1 on i386, NetBSD 6 / gcc 4.5 on amd64, OpenBSD 5 / gcc 4.2 on
  amd64, Solaris 11 / gcc 4.5 on i86pc, Windows 7 / Visual Studio 2012
  on x86, Windows 8 / Visual Studio 2010 on WOW64, Windows 8.1 / Visual
  Studio 2013 on WOW64.

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 19 insertions, 132 deletions

diff --git a/src/common/core.c b/src/common/core.c
index c6075da40..798c832f0 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -9,6 +9,7 @@
 #include "core.h"
 #include "../common/console.h"
 #include "../common/random.h"
+#include "../common/sysinfo.h"
 
 #ifndef MINICORE
 	#include "../common/db.h"
@@ -78,7 +79,7 @@ sigfunc *compat_signal(int signo, sigfunc *func) {
  *--------------------------------------*/
 #ifdef _WIN32
 static BOOL WINAPI console_handler(DWORD c_event) {
-    switch(c_event) {
+	switch(c_event) {
 		case CTRL_CLOSE_EVENT:
 		case CTRL_LOGOFF_EVENT:
 		case CTRL_SHUTDOWN_EVENT:
@@ -89,8 +90,8 @@ static BOOL WINAPI console_handler(DWORD c_event) {
 			break;
 		default:
 			return FALSE;
-    }
-    return TRUE;
+	}
+	return TRUE;
 }
 
 static void cevents_init() {
@@ -152,134 +153,21 @@ void signals_init (void) {
 }
 #endif
 
-const char* get_svn_revision(void) {
-	static char svn_version_buffer[16] = "";
-	FILE *fp;
-
-	if( svn_version_buffer[0] != '\0' )
-		return svn_version_buffer;
-
-	// subversion 1.7 uses a sqlite3 database
-	// FIXME this is hackish at best...
-	// - ignores database file structure
-	// - assumes the data in NODES.dav_cache column ends with "!svn/ver/<revision>/<path>)"
-	// - since it's a cache column, the data might not even exist
-	if( (fp = fopen(".svn"PATHSEP_STR"wc.db", "rb")) != NULL || (fp = fopen(".."PATHSEP_STR".svn"PATHSEP_STR"wc.db", "rb")) != NULL )
-	{
-	#ifndef SVNNODEPATH
-		//not sure how to handle branches, so i'll leave this overridable define until a better solution comes up
-		#define SVNNODEPATH trunk
-	#endif
-		const char* prefix = "!svn/ver/";
-		const char* postfix = "/"EXPAND_AND_QUOTE(SVNNODEPATH)")"; // there should exist only 1 entry like this
-		size_t prefix_len = strlen(prefix);
-		size_t postfix_len = strlen(postfix);
-		size_t i,j,len;
-		char* buffer;
-
-		// read file to buffer
-		fseek(fp, 0, SEEK_END);
-		len = ftell(fp);
-		buffer = (char*)aMalloc(len + 1);
-		fseek(fp, 0, SEEK_SET);
-		len = fread(buffer, 1, len, fp);
-		buffer[len] = '\0';
-		fclose(fp);
-
-		// parse buffer
-		for( i = prefix_len + 1; i + postfix_len <= len; ++i ) {
-			if( buffer[i] != postfix[0] || memcmp(buffer + i, postfix, postfix_len) != 0 )
-				continue; // postfix missmatch
-			for( j = i; j > 0; --j ) {// skip digits
-				if( !ISDIGIT(buffer[j - 1]) )
-					break;
-			}
-			if( memcmp(buffer + j - prefix_len, prefix, prefix_len) != 0 )
-				continue; // prefix missmatch
-			// done
-			snprintf(svn_version_buffer, sizeof(svn_version_buffer), "%d", atoi(buffer + j));
-			break;
-		}
-		aFree(buffer);
-
-		if( svn_version_buffer[0] != '\0' )
-			return svn_version_buffer;
-	}
-
-	// subversion 1.6 and older?
-	if ((fp = fopen(".svn/entries", "r")) != NULL) {
-		char line[1024];
-		int rev;
-		// Check the version
-		if (fgets(line, sizeof(line), fp)) {
-			if(!ISDIGIT(line[0])) {
-				// XML File format
-				while (fgets(line,sizeof(line),fp))
-					if (strstr(line,"revision=")) break;
-				if (sscanf(line," %*[^\"]\"%d%*[^\n]", &rev) == 1) {
-					snprintf(svn_version_buffer, sizeof(svn_version_buffer), "%d", rev);
-				}
-			} else {
-				// Bin File format
-				if ( fgets(line, sizeof(line), fp) == NULL ) { printf("Can't get bin name\n"); } // Get the name
-				if ( fgets(line, sizeof(line), fp) == NULL ) { printf("Can't get entries kind\n"); } // Get the entries kind
-				if(fgets(line, sizeof(line), fp)) { // Get the rev numver
-					snprintf(svn_version_buffer, sizeof(svn_version_buffer), "%d", atoi(line));
-				}
-			}
-		}
-		fclose(fp);
-
-		if( svn_version_buffer[0] != '\0' )
-			return svn_version_buffer;
-	}
-
-	// fallback
-	svn_version_buffer[0] = HERC_UNKNOWN_VER;
-	return svn_version_buffer;
-}
-/* whats our origin */
-#define GIT_ORIGIN "refs/remotes/origin/master"
-/* Grabs the hash from the last time the user updated his working copy (last pull)  */
-const char *get_git_hash (void) {
-	static char HerculesGitHash[41] = "";//Sha(40) + 1
-	FILE *fp;
-	
-	if( HerculesGitHash[0] != '\0' )
-		return HerculesGitHash;
-	
-	if ( (fp = fopen (".git/"GIT_ORIGIN, "r")) != NULL) {
-		char line[64];
-		char *rev = malloc (sizeof (char) * 50);
-		
-		if (fgets (line, sizeof (line), fp) && sscanf (line, "%50s", rev))
-			snprintf (HerculesGitHash, sizeof (HerculesGitHash), "%s", rev);
-		
-		free (rev);
-		fclose (fp);
-	} else {
-		HerculesGitHash[0] = HERC_UNKNOWN_VER;
-	}
-	
-	if (! (*HerculesGitHash)) {
-		HerculesGitHash[0] = HERC_UNKNOWN_VER;
-	}
-	
-	return HerculesGitHash;
-}
-// Warning if executed as superuser (root)
+/**
+ * Warns the user if executed as superuser (root)
+ */
 void usercheck(void) {
-#ifndef _WIN32
-    if (geteuid() == 0) {
-		ShowWarning ("You are running Hercules with root privileges, it is not necessary.\n");
-    }
-#endif
+	if (sysinfo->is_superuser()) {
+		ShowWarning("You are running Hercules with root privileges, it is not necessary.\n");
+	}
 }
+
 void core_defaults(void) {
 #ifndef MINICORE
 	hpm_defaults();
 	HCache_defaults();
 #endif
+	sysinfo_defaults();
 	console_defaults();
 	strlib_defaults();
 	malloc_defaults();
@@ -318,16 +206,18 @@ int main (int argc, char **argv) {
 	
 	iMalloc->init();// needed for Show* in display_title() [FlavioJS]
 
+	sysinfo->init();
+
 	if (!(msg_silent&0x1))
 		console->display_title();
-	
-#ifdef MINICORE // minimalist Core
+
 	usercheck();
+
+#ifdef MINICORE // minimalist Core
 	do_init(argc,argv);
 	do_final();
 #else// not MINICORE
 	set_server_type();
-	usercheck();
 
 	Sql_Init();
 	rathread_init();
@@ -348,10 +238,8 @@ int main (int argc, char **argv) {
 	
 	HCache->init();
 	
-#ifndef MINICORE
 	HPM->init();
-#endif
-		
+
 	sockt->init();
 
 	do_init(argc,argv);
@@ -366,15 +254,14 @@ int main (int argc, char **argv) {
 	console->final();
 	
 	do_final();
-#ifndef MINICORE
 	HPM->final();
-#endif
 	timer->final();
 	sockt->final();
 	DB->final();
 	rathread_final();
 	ers_final();
 #endif
+	sysinfo->final();
 
 	iMalloc->final();