diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 14 | ||||
| -rw-r--r-- | g10/armor.c | 5 | ||||
| -rw-r--r-- | g10/g10.c | 2 | ||||
| -rw-r--r-- | g10/openfile.c | 2 | ||||
| -rw-r--r-- | g10/options.h | 1 | ||||
| -rw-r--r-- | g10/sign.c | 2 |
6 files changed, 21 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index ed3bceb1c..14f284d88 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,17 @@ +2001-08-07 Werner Koch <[email protected]> + + * sign.c (sleep): Redefine for W32. + + * g10.c, options.h: Set new flag opt.no_homedir_creation when + --no-options is given. + * openfile.c (try_make_homedir): Don't create the homedir in that case. + +2001-08-03 Werner Koch <[email protected]> + + * armor.c (armor_filter): Removed the default comment string + because it could get us in trouble due to translations using non + ascii characters. + 2001-08-01 Werner Koch <[email protected]> * keylist.c (list_keyblock_print): Do not list revoked UIDs unless diff --git a/g10/armor.c b/g10/armor.c index a9c520ab5..1729217a5 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -918,9 +918,8 @@ armor_filter( void *opaque, int control, PRINTABLE_OS_NAME ")" LF ); /* write the comment string or a default one */ - s = opt.comment_string ? opt.comment_string - : _("For info see http://www.gnupg.org"); - if( *s ) { + s = opt.comment_string; + if( s && *s ) { iobuf_writestr(a, "Comment: " ); for( ; *s; s++ ) { if( *s == '\n' ) @@ -861,7 +861,7 @@ main( int argc, char **argv ) m_free(opt.def_recipient); opt.def_recipient = NULL; opt.def_recipient_self = 0; break; - case oNoOptions: break; /* no-options */ + case oNoOptions: opt.no_homedir_creation = 1; break; /* no-options */ case oHomedir: break; case oNoBatch: opt.batch = 0; break; case oWithKeyData: opt.with_key_data=1; /* fall thru */ diff --git a/g10/openfile.c b/g10/openfile.c index 99b81fe7b..2baf5a191 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -336,7 +336,7 @@ try_make_homedir( const char *fname ) * To cope with HOME, we do compare only the suffix if we see that * the default homedir does start with a tilde. */ - if( opt.dry_run ) + if( opt.dry_run || opt.no_homedir_creation ) return; if ( ( *defhome == '~' diff --git a/g10/options.h b/g10/options.h index e76104fab..ffd4e574c 100644 --- a/g10/options.h +++ b/g10/options.h @@ -105,6 +105,7 @@ struct { int no_sig_cache; int no_sig_create_check; int preserve_permissions; + int no_homedir_creation; } opt; diff --git a/g10/sign.c b/g10/sign.c index d622abb27..e54fdf4b8 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -43,6 +43,8 @@ #ifdef HAVE_DOSISH_SYSTEM #define LF "\r\n" + void __stdcall Sleep(ulong); + #define sleep(a) Sleep((a)*1000) #else #define LF "\n" #endif |