diff options
author | Werner Koch <wk@gnupg.org> | 2008-12-05 13:01:01 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2008-12-05 13:01:01 +0100 |
commit | 041c764672705c842b43f4978b4a4dfd32a5977b (patch) | |
tree | 915666ed83407455549136af3b404b2238a8b79e /common | |
parent | Translate the oktext (yes/no). (diff) | |
download | gnupg2-041c764672705c842b43f4978b4a4dfd32a5977b.tar.xz gnupg2-041c764672705c842b43f4978b4a4dfd32a5977b.zip |
Add option --card-timeout.
Add a new attribyte to app-openpgp.c
Fix two portability bugs.
Have gpg-connect-agent autostart gpg-agent on W32.
Diffstat (limited to 'common')
-rw-r--r-- | common/ChangeLog | 5 | ||||
-rw-r--r-- | common/exechelp.c | 32 |
2 files changed, 21 insertions, 16 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index c1ae39b6b..b1390d599 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,8 @@ +2008-12-05 Werner Koch <wk@g10code.com> + + * exechelp.c (gnupg_spawn_process, gnupg_spawn_process_fd) + (gnupg_spawn_process_detached) [W32]: Remove debug output. + 2008-11-20 Werner Koch <wk@g10code.com> * audit.c (writeout_li): Translate OKTEXT. diff --git a/common/exechelp.c b/common/exechelp.c index 2246c78ea..bb9ddd557 100644 --- a/common/exechelp.c +++ b/common/exechelp.c @@ -396,7 +396,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[], | ((flags & 128)? DETACHED_PROCESS : 0) | GetPriorityClass (GetCurrentProcess ()) | CREATE_SUSPENDED); - log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline); +/* log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline); */ if (!CreateProcess (pgmname, /* Program to start. */ cmdline, /* Command line arguments. */ &sec_attr, /* Process security attributes. */ @@ -421,10 +421,10 @@ gnupg_spawn_process (const char *pgmname, const char *argv[], /* Close the other end of the pipe. */ CloseHandle (fd_to_handle (rp[1])); - log_debug ("CreateProcess ready: hProcess=%p hThread=%p" - " dwProcessID=%d dwThreadId=%d\n", - pi.hProcess, pi.hThread, - (int) pi.dwProcessId, (int) pi.dwThreadId); +/* log_debug ("CreateProcess ready: hProcess=%p hThread=%p" */ +/* " dwProcessID=%d dwThreadId=%d\n", */ +/* pi.hProcess, pi.hThread, */ +/* (int) pi.dwProcessId, (int) pi.dwThreadId); */ /* Process has been created suspended; resume it now. */ ResumeThread (pi.hThread); @@ -558,7 +558,7 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[], si.hStdOutput = outfd == -1? stdhd[1] : (void*)_get_osfhandle (outfd); si.hStdError = errfd == -1? stdhd[2] : (void*)_get_osfhandle (errfd); - log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline); +/* log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline); */ if (!CreateProcess (pgmname, /* Program to start. */ cmdline, /* Command line arguments. */ &sec_attr, /* Process security attributes. */ @@ -585,10 +585,10 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[], if (err) return err; - log_debug ("CreateProcess ready: hProcess=%p hThread=%p" - " dwProcessID=%d dwThreadId=%d\n", - pi.hProcess, pi.hThread, - (int) pi.dwProcessId, (int) pi.dwThreadId); +/* log_debug ("CreateProcess ready: hProcess=%p hThread=%p" */ +/* " dwProcessID=%d dwThreadId=%d\n", */ +/* pi.hProcess, pi.hThread, */ +/* (int) pi.dwProcessId, (int) pi.dwThreadId); */ /* Process has been created suspended; resume it now. */ ResumeThread (pi.hThread); @@ -796,8 +796,8 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[], | GetPriorityClass (GetCurrentProcess ()) | CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS); - log_debug ("CreateProcess(detached), path=`%s' cmdline=`%s'\n", - pgmname, cmdline); +/* log_debug ("CreateProcess(detached), path=`%s' cmdline=`%s'\n", */ +/* pgmname, cmdline); */ if (!CreateProcess (pgmname, /* Program to start. */ cmdline, /* Command line arguments. */ &sec_attr, /* Process security attributes. */ @@ -817,10 +817,10 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[], xfree (cmdline); cmdline = NULL; - log_debug ("CreateProcess(detached) ready: hProcess=%p hThread=%p" - " dwProcessID=%d dwThreadId=%d\n", - pi.hProcess, pi.hThread, - (int) pi.dwProcessId, (int) pi.dwThreadId); +/* log_debug ("CreateProcess(detached) ready: hProcess=%p hThread=%p" */ +/* " dwProcessID=%d dwThreadId=%d\n", */ +/* pi.hProcess, pi.hThread, */ +/* (int) pi.dwProcessId, (int) pi.dwThreadId); */ CloseHandle (pi.hThread); |