mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-10 13:04:23 +01:00
Small W32 fixes
This commit is contained in:
parent
a66fa9c25e
commit
bb8276a4ee
@ -31,6 +31,9 @@
|
|||||||
#include <dl.h>
|
#include <dl.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __MINGW32__
|
||||||
|
#include <windows.h>
|
||||||
|
#endif
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "cipher.h"
|
#include "cipher.h"
|
||||||
#include "dynload.h"
|
#include "dynload.h"
|
||||||
|
@ -227,6 +227,13 @@ more arguments in future versions.
|
|||||||
(only the first character should be checked)
|
(only the first character should be checked)
|
||||||
class: 2 hex digits with the signature class
|
class: 2 hex digits with the signature class
|
||||||
|
|
||||||
|
KEY_CREATED <type>
|
||||||
|
A key has been created
|
||||||
|
type: 'B' = primary and subkey
|
||||||
|
'P' = primary
|
||||||
|
'S' = subkey
|
||||||
|
|
||||||
|
|
||||||
SESSION_KEY <algo>:<hexdigits>
|
SESSION_KEY <algo>:<hexdigits>
|
||||||
The session key used to decrypt the message. This message will
|
The session key used to decrypt the message. This message will
|
||||||
only be emmited when the special option --show-session-key
|
only be emmited when the special option --show-session-key
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
2001-01-04 Werner Koch <wk@gnupg.org>
|
||||||
|
|
||||||
|
* g10.c (main): Set homedir only in the pre-parsing phase and
|
||||||
|
replaces backslashes in the W32 version.
|
||||||
|
|
||||||
2001-01-03 Werner Koch <wk@gnupg.org>
|
2001-01-03 Werner Koch <wk@gnupg.org>
|
||||||
|
|
||||||
* status.c, status.h : New status KEY_CREATED
|
* status.c, status.h : New status KEY_CREATED
|
||||||
|
12
g10/g10.c
12
g10/g10.c
@ -684,6 +684,16 @@ main( int argc, char **argv )
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_DOSISH_SYSTEM
|
||||||
|
if ( strchr (opt.homedir,'\\') ) {
|
||||||
|
char *d, *buf = m_alloc (strlen (opt.homedir)+1);
|
||||||
|
const char *s = opt.homedir;
|
||||||
|
for (d=buf,s=opt.homedir; *s; s++)
|
||||||
|
*d++ = *s == '\\'? '/': *s;
|
||||||
|
*d = 0;
|
||||||
|
opt.homedir = buf;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef USE_SHM_COPROCESSING
|
#ifdef USE_SHM_COPROCESSING
|
||||||
if( opt.shm_coprocess ) {
|
if( opt.shm_coprocess ) {
|
||||||
@ -838,7 +848,7 @@ main( int argc, char **argv )
|
|||||||
opt.def_recipient_self = 0;
|
opt.def_recipient_self = 0;
|
||||||
break;
|
break;
|
||||||
case oNoOptions: break; /* no-options */
|
case oNoOptions: break; /* no-options */
|
||||||
case oHomedir: opt.homedir = pargs.r.ret_str; break;
|
case oHomedir: break;
|
||||||
case oNoBatch: opt.batch = 0; break;
|
case oNoBatch: opt.batch = 0; break;
|
||||||
case oWithKeyData: opt.with_key_data=1; /* fall thru */
|
case oWithKeyData: opt.with_key_data=1; /* fall thru */
|
||||||
case oWithColons: opt.with_colons=':'; break;
|
case oWithColons: opt.with_colons=':'; break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user