From bef8e360e5e40ee4e8648a5c56b2fae3fefb1c0a Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss123next@list.ru>
Date: Mon, 30 Aug 2010 23:06:15 +0300
Subject: better logging

---
 gpg_wrapper.cpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'gpg_wrapper.cpp')

diff --git a/gpg_wrapper.cpp b/gpg_wrapper.cpp
index 1a29440..fa8c8f7 100644
--- a/gpg_wrapper.cpp
+++ b/gpg_wrapper.cpp
@@ -21,8 +21,7 @@
 
 pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD aexitcode, pxResult *result)
 {
-	extern bool bDebugLog;
-	extern fstream debuglog;
+	extern logtofile debuglog;
 	BOOL success;
 	STARTUPINFO sinfo = {0};
 	SECURITY_ATTRIBUTES sattrs = {0};
@@ -87,12 +86,7 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD
 		mir_free(home_dir);
 	}
 	
-	if(bDebugLog)
-	{
-		char* tmp = mir_utf8encodeW(commandline.c_str());
-		debuglog<<"in: "<<tmp<<"\n";
-		mir_free(tmp);
-	}
+	debuglog<<"in: "<<commandline<<"\n";
 
 	TCHAR chNewEnv[128];
 	LPTSTR lpszCurrentVariable;
@@ -132,10 +126,7 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD
 	
 	storeOutput(readstdout,aoutput);
 
-	if(bDebugLog)
-	{
-		debuglog<<"out: "<<aoutput->c_str()<<"\n";
-	}	
+	debuglog<<"out: "<<aoutput->c_str()<<"\n";
 
 	WaitForSingleObject(pri.hProcess,INFINITE);
 	
-- 
cgit v1.2.3