- Bug fix (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@2400 97f52cf1-0a1b-0410-bd0e-c28be96e8082

5 files changed, 8 insertions, 94 deletions

diff --git a/src/libs/zbxlog/log.c b/src/libs/zbxlog/log.c
index 3de70b99..59b10377 100644
--- a/src/libs/zbxlog/log.c
+++ b/src/libs/zbxlog/log.c
@@ -102,7 +102,7 @@ void zabbix_log(int level, const char *fmt, ...)
 		va_start(ap,fmt);
 		vsprintf(str,fmt,ap);
 		strncat(str,"\n",MAX_STRING_LEN);
-		str[MAX_STRING_LEN]=0;
+		str[MAX_STRING_LEN-1]=0;
 		syslog(LOG_DEBUG,str);
 		va_end(ap);
 	}
diff --git a/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/common.c
index f3fe4cc9..b6c3a65e 100644
--- a/src/libs/zbxsysinfo/common/common.c
+++ b/src/libs/zbxsysinfo/common/common.c
@@ -808,7 +808,7 @@ int	TCP_LISTEN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT
 	FILE	*f;
 	char	c[MAX_STRING_LEN];
 	char	porthex[MAX_STRING_LEN];
-	char	pattern[MAX_STRING_LEN]="0050 00000000:0000 0A";
+	char	pattern[MAX_STRING_LEN];
 
         assert(result);
 
diff --git a/src/libs/zbxsysinfo/osf/memory.c b/src/libs/zbxsysinfo/osf/memory.c
index c70f1be5..31bef3e0 100644
--- a/src/libs/zbxsysinfo/osf/memory.c
+++ b/src/libs/zbxsysinfo/osf/memory.c
@@ -239,94 +239,8 @@ static int	VM_MEMORY_TOTAL(const char *cmd, const char *param, unsigned flags, A
 
 static int	VM_MEMORY_FREE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
-/* Solaris */
-#ifdef HAVE_UNISTD_SYSCONF
-	assert(result);
-
-        init_result(result);
-		
-	SET_UI64_RESULT(result, sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE));
-	return SYSINFO_RET_OK;
-#elif defined(HAVE_SYS_PSTAT_H)
-	struct	pst_static pst;
-	struct	pst_dynamic dyn;
-	long	page;
-
-	assert(result);
-
-        init_result(result);
-		
-	if(pstat_getstatic(&pst, sizeof(pst), (size_t)1, 0) == -1)
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	else
-	{
-		/* Get page size */	
-		page = pst.page_size;
-/*		return pst.physical_memory;*/
-
-		if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1)
-		{
-			return SYSINFO_RET_FAIL;
-		}
-		else
-		{
-/*		cout<<"total virtual memory allocated is " << dyn.psd_vm << "
-		pages, " << dyn.psd_vm * page << " bytes" << endl;
-		cout<<"active virtual memory is " << dyn.psd_avm <<" pages, " <<
-		dyn.psd_avm * page << " bytes" << endl;
-		cout<<"total real memory is " << dyn.psd_rm << " pages, " <<
-		dyn.psd_rm * page << " bytes" << endl;
-		cout<<"active real memory is " << dyn.psd_arm << " pages, " <<
-		dyn.psd_arm * page << " bytes" << endl;
-		cout<<"free memory is " << dyn.psd_free << " pages, " <<
-*/
-		/* Free memory in bytes */
-
-			SET_UI64_RESULT(result, dyn.psd_free * page);
-			return SYSINFO_RET_OK;
-		}
-	}
-#elif defined(HAVE_SYSINFO_FREERAM)
-	struct sysinfo info;
-
-	assert(result);
-
-        init_result(result);
-		
-	if( 0 == sysinfo(&info))
-	{
-#ifdef HAVE_SYSINFO_MEM_UNIT
-		SET_UI64_RESULT(result, info.freeram * info.mem_unit);
-#else	
-		SET_UI64_RESULT(result, info.freeram);
-#endif
-		return SYSINFO_RET_OK;
-	}
-	else
-	{
-		return SYSINFO_RET_FAIL;
-	}
-#elif defined(HAVE_SYS_VMMETER_VMTOTAL)
-	int mib[2],len;
-	struct vmtotal v;
-
-	assert(result);
-
-        init_result(result);
-		
-	len=sizeof(struct vmtotal);
-	mib[0]=CTL_VM;
-	mib[1]=VM_METER;
-
-	sysctl(mib,2,&v,&len,NULL,0);
-
-	SET_UI64_RESULT(result, v.t_free<<2);
-	return SYSINFO_RET_OK;
-/* OS/X */
-#elif defined(HAVE_MACH_HOST_INFO_H)
-	vm_statistics_data_t page_info;
+/*
+	host_paging_info_data_t page_info;
 	vm_size_t pagesize;
 	mach_msg_type_number_t count;
 	kern_return_t kret;
@@ -361,13 +275,13 @@ static int	VM_MEMORY_FREE(const char *cmd, const char *param, unsigned flags, AG
 		ret = SYSINFO_RET_FAIL;
 	}
 	return ret;
-#else
+*/
 	assert(result);
 
         init_result(result);
 		
 	return	SYSINFO_RET_FAIL;
-#endif
+	
 }
 
 int     VM_MEMORY_SIZE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
diff --git a/src/zabbix_agent_win32/active.cpp b/src/zabbix_agent_win32/active.cpp
index 098c194f..f082959e 100755
--- a/src/zabbix_agent_win32/active.cpp
+++ b/src/zabbix_agent_win32/active.cpp
@@ -609,7 +609,7 @@ INIT_CHECK_MEMORY(main);
 //				{
 //					value[j]='0';
 //				}
-//				value[MAX_STRING_LEN]=0;
+//				value[MAX_STRING_LEN-1]=0;
 				LOG_DEBUG_INFO("s","pac: 2");
 				LOG_DEBUG_INFO("s",value);
 				if(send_value(server,port,confHostname,metrics[i].key, value, lastlogsize,timestamp,source,severity) == FAIL)
diff --git a/src/zabbix_server/zlog.c b/src/zabbix_server/zlog.c
index ad889034..b0bfb85c 100644
--- a/src/zabbix_server/zlog.c
+++ b/src/zabbix_server/zlog.c
@@ -78,7 +78,7 @@ void zabbix_syslog(const char *fmt, ...)
 	
 			va_start(ap,fmt);
 			vsprintf(value_str,fmt,ap);
-			value_str[MAX_STRING_LEN]=0;
+			value_str[MAX_STRING_LEN-1]=0;
 			va_end(ap);
 
 			init_result(&agent);