modified: gpg_wrapper.cpp

	modified:   init.cpp
	modified:   main.cpp
	modified:   messages.cpp
	modified:   new_gpg.rc
	modified:   new_gpg.sln
	modified:   new_gpg.vcproj
	modified:   options.cpp
	modified:   resource.h
	modified:   utilities.cpp

1 files changed, 14 insertions, 0 deletions

diff --git a/gpg_wrapper.cpp b/gpg_wrapper.cpp
index 566031f..8ff6631 100644
--- a/gpg_wrapper.cpp
+++ b/gpg_wrapper.cpp
@@ -20,6 +20,8 @@
 

 pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD aexitcode)

 {

+	extern bool bDebugLog;

+	extern fstream debuglog;

 	BOOL success;

 	STARTUPINFO sinfo = {0};

 	SECURITY_ATTRIBUTES sattrs = {0};

@@ -80,6 +82,12 @@ 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);

+	}	

 	success = CreateProcess(NULL, (TCHAR*)commandline.c_str(), NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &sinfo, &pri);

 	

 	if (!success)

@@ -109,6 +117,12 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD
 	}

 	

 	storeOutput(readstdout,aoutput);

+

+	if(bDebugLog)

+	{
+		debuglog<<"out: "<<aoutput->c_str()<<"\n";

+	}	

+

 	WaitForSingleObject(pri.hProcess,INFINITE);

 	

 	CloseHandle(pri.hThread);