tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove config_file_encoding and assume UTF-8

This commit is contained in:
fermin831 2015-09-16 15:39:50 +02:00
parent cfe55e6800
commit 01fe18ab10
2 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pandora_agents/win32/modules/pandora_module_exec.cc
View File

@ -42,7 +42,6 @@ Pandora_Module_Exec::Pandora_Module_Exec (string name, string exec)
this->proc = 0; this->proc = 0;
this->setKind (module_exec_str); this->setKind (module_exec_str);
this->native_encoding = -1; this->native_encoding = -1;
this->config_encoding = -1;
} }
/** /**
@ -80,10 +79,7 @@ Pandora_Module_Exec::Pandora_Module_Exec (string name, string exec, string nativ
} else { } else {
this->output_encoding = ""; this->output_encoding = "";
this->native_encoding = -1;
} }
getConfigFileEncoding();
} }
void void
@ -151,11 +147,9 @@ Pandora_Module_Exec::run () {
to find the GNU W32 tools */ to find the GNU W32 tools */
working_dir = getPandoraInstallDir () + "util\\"; working_dir = getPandoraInstallDir () + "util\\";
/*change input encoding if config_file_encoding token is present*/ /*allways change input encoding from UTF-8 to ANSI*/
if (this->config_encoding != -1){ changeInputEncoding();
changeInputEncoding();
}
/* Create the child process. */ /* Create the child process. */
if (! CreateProcess (NULL, (CHAR *) this->module_exec.c_str (), NULL, if (! CreateProcess (NULL, (CHAR *) this->module_exec.c_str (), NULL,
NULL, TRUE, CREATE_SUSPENDED | CREATE_NO_WINDOW, NULL, NULL, TRUE, CREATE_SUSPENDED | CREATE_NO_WINDOW, NULL,
@ -439,47 +433,12 @@ void Pandora_Module_Exec::getOutputEncoding(){
file.close(); file.close();
} }
void Pandora_Module_Exec::getConfigFileEncoding(){
string config_encoding_string;
config_encoding_string = "";
string buffer, filename;
int pos;
filename = Pandora::getPandoraInstallDir ();
filename += "pandora_agent.conf";
ifstream file;
file.open (filename.c_str ());
bool token_found = false;
while (!file.eof () && !token_found) {
/* Set the value from each line */
getline (file, buffer);
/* Ignore blank or commented lines */
if (buffer[0] != '#' && buffer[0] != '\n' && buffer[0] != '\0') {
/*Check if is the encoding line*/
pos = buffer.find("config_file_encoding");
if (pos != string::npos){
config_encoding_string = buffer.substr (pos+21);
token_found = true;
}
}
}
if (token_found) {
this->config_encoding = getNumberEncoding (config_encoding_string);
} else {
this->config_encoding = -1;
}
file.close();
}
void Pandora_Module_Exec::changeInputEncoding(){ void Pandora_Module_Exec::changeInputEncoding(){
int size_wchar = MultiByteToWideChar( this->config_encoding , 0 , this->module_exec.c_str () , -1, NULL , 0 ); int size_wchar = MultiByteToWideChar( CP_UTF8 , 0 , this->module_exec.c_str () , -1, NULL , 0 );
wchar_t* wstr = new wchar_t[size_wchar]; wchar_t* wstr = new wchar_t[size_wchar];
if (size_wchar != 0){ if (size_wchar != 0){
MultiByteToWideChar( this->config_encoding , 0 , this->module_exec.c_str () , -1, wstr , size_wchar ); MultiByteToWideChar( CP_UTF8 , 0 , this->module_exec.c_str () , -1, wstr , size_wchar );
char buf[BUFSIZE + 1]; char buf[BUFSIZE + 1];
wcstombs(buf, wstr, size_wchar); wcstombs(buf, wstr, size_wchar);
buf[size_wchar] = '\0'; buf[size_wchar] = '\0';

2
pandora_agents/win32/modules/pandora_module_exec.h
View File

@ -37,11 +37,9 @@ namespace Pandora_Modules {
UINT native_encoding; UINT native_encoding;
string output_encoding; string output_encoding;
UINT getNumberEncoding(string encoding); UINT getNumberEncoding(string encoding);
UINT config_encoding;
void getOutputEncoding(); void getOutputEncoding();
void changeInputEncoding(); void changeInputEncoding();
void changeOutputEncoding(string * string_change); void changeOutputEncoding(string * string_change);
void getConfigFileEncoding();
public: public:
unsigned char proc; unsigned char proc;
Pandora_Module_Exec (string name, string exec); Pandora_Module_Exec (string name, string exec);