diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/g10.c | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 691e3f59a..84dd695eb 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2001-01-04 Werner Koch <[email protected]> + + * g10.c (main): Set homedir only in the pre-parsing phase and + replaces backslashes in the W32 version. + 2001-01-03 Werner Koch <[email protected]> * status.c, status.h : New status KEY_CREATED @@ -684,6 +684,16 @@ main( int argc, char **argv ) #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 if( opt.shm_coprocess ) { @@ -838,7 +848,7 @@ main( int argc, char **argv ) opt.def_recipient_self = 0; break; case oNoOptions: break; /* no-options */ - case oHomedir: opt.homedir = pargs.r.ret_str; break; + case oHomedir: break; case oNoBatch: opt.batch = 0; break; case oWithKeyData: opt.with_key_data=1; /* fall thru */ case oWithColons: opt.with_colons=':'; break; |