From a35a06dc1dde77fafc49ce87a4e271d5c61d3e59 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Fri, 16 Dec 2005 10:13:59 +0000
Subject: [PATCH] Bug 232 - Revamped build and install

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1678 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 src/zm_config.cpp | 13 ++++++++-----
 src/zm_db.cpp     |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index a90bf34c8..ec8ee5d68 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -24,7 +24,7 @@
 #include "zm.h"
 #include "zm_db.h"
 
-char *ZM_DB_SERVER="", *ZM_DB_NAME="", *ZM_DB_USER="", *ZM_DB_PASS="";
+char *ZM_DB_HOST="", *ZM_DB_NAME="", *ZM_DB_USER="", *ZM_DB_PASS="", *ZM_PATH_WEB="";
 
 void zmLoadConfig()
 {
@@ -32,7 +32,7 @@ void zmLoadConfig()
 	char line[512];
 	char *val;
 	int r;
-	if (( cfg = fopen( ZM_CONFIG, "r" )) == NULL )
+	if ( (cfg = fopen( ZM_CONFIG, "r")) == NULL )
 	{
 		Fatal(("Can't open %s: %s", ZM_CONFIG, strerror(errno) ));
 	}
@@ -56,7 +56,7 @@ void zmLoadConfig()
 		char *temp_ptr = line_ptr+strlen(line_ptr)-1;
 		while ( *temp_ptr == ' ' || *temp_ptr == '\t' )
 		{
-			*temp_ptr = '\0';
+			*temp_ptr-- = '\0';
 			temp_ptr--;
 		}
 
@@ -87,13 +87,16 @@ void zmLoadConfig()
 		val = (char *)malloc( strlen(val_ptr)+1 );
 		strncpy( val, val_ptr, strlen(val_ptr)+1 );
 
-		if ( strcasecmp( name_ptr, "ZM_DB_SERVER" ) == 0 ) ZM_DB_SERVER = val;
+		if ( strcasecmp( name_ptr, "ZM_DB_HOST" ) == 0 ) ZM_DB_HOST = val;
 		else if ( strcasecmp( name_ptr, "ZM_DB_NAME" ) == 0 ) ZM_DB_NAME = val;
 		else if ( strcasecmp( name_ptr, "ZM_DB_USER" ) == 0 ) ZM_DB_USER = val;
 		else if ( strcasecmp( name_ptr, "ZM_DB_PASS" ) == 0 ) ZM_DB_PASS = val;
+		else if ( strcasecmp( name_ptr, "ZM_PATH_WEB" ) == 0 ) ZM_PATH_WEB = val;
 		else
 		{
-			Warning(( "Invalid parameter '%s' in %s", name_ptr, ZM_CONFIG ));
+			// We ignore this now as there may be more parameters than the
+			// c/c++ binaries are bothered about
+			// Warning(( "Invalid parameter '%s' in %s", name_ptr, ZM_CONFIG ));
 		}
 	}
 	fclose( cfg);
diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index 109fd89ce..bfb20163d 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -31,7 +31,7 @@ void zmDbConnect()
 		Error(( "Can't initialise structure: %s", mysql_error( &dbconn ) ));
 		exit( mysql_errno( &dbconn ) );
 	}
-	if ( !mysql_real_connect( &dbconn, ZM_DB_SERVER, ZM_DB_USER, ZM_DB_PASS, 0, 0, 0, 0 ) )
+	if ( !mysql_real_connect( &dbconn, ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS, 0, 0, 0, 0 ) )
 	{
 		Error(( "Can't connect to server: %s", mysql_error( &dbconn ) ));
 		exit( mysql_errno( &dbconn ) );