diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 15 | ||||
| -rw-r--r-- | g10/gpg.c | 8 | ||||
| -rw-r--r-- | g10/openfile.c | 14 |
3 files changed, 35 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 898a7fa6b..9c941d15a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2007-07-09 Werner Koch <[email protected]> + + * gpg.c: Better print an extra warning if Camellia has been + configured. + 2007-07-06 David Shaw <[email protected]> * encode.c (encode_crypt): Missed one call to @@ -12,6 +17,16 @@ enable or disable notations, policies, and keyserver URLs. This is bug#800. +2007-05-09 Werner Koch <[email protected]> + + * openfile.c (overwrite_filep, open_outfile) [W32]: Need to use + just "nul". Though, I am pretty sure that some MSDOS versions + grok the extra /dev/. + +2007-05-07 Werner Koch <[email protected]> + + * openfile.c (open_outfile, overwrite_filep) [W32]: Use "/dev/nul". + 2007-04-16 David Shaw <[email protected]> * packet.h, mainproc.c (reset_literals_seen): New function to @@ -2847,6 +2847,14 @@ main (int argc, char **argv ) log_info("%s\n",s); } #endif +#ifdef USE_CAMELLIA + /* We better also print a runtime warning if people build it with + support for Camellia (which is not yet defiend by OpenPGP). */ + log_info ("WARNING: This version has been build with support for the " + "Camellia cipher.\n"); + log_info (" It is for testing only and is NOT for production " + "use!\n"); +#endif if (opt.verbose > 2) log_info ("using character set `%s'\n", get_native_charset ()); diff --git a/g10/openfile.c b/g10/openfile.c index a6383a44a..d142f6712 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -76,6 +76,10 @@ overwrite_filep( const char *fname ) if ( !strcmp ( fname, "/dev/null" ) ) return 1; /* does not do any harm */ #endif +#ifdef HAVE_W32_SYSTEM + if ( !strcmp ( fname, "nul" ) ) + return 1; +#endif /* fixme: add some backup stuff in case of overwrite */ if( opt.answer_yes ) @@ -193,8 +197,14 @@ open_outfile( const char *iname, int mode, IOBUF *a ) char *buf = NULL; const char *name; - if( opt.dry_run ) - name = "/dev/null"; + if ( opt.dry_run ) + { +#ifdef HAVE_W32_SYSTEM + name = "nul"; +#else + name = "/dev/null"; +#endif + } else if( opt.outfile ) name = opt.outfile; else { |