diff options
| author | David Shaw <[email protected]> | 2003-12-04 04:58:12 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-12-04 04:58:12 +0000 |
| commit | 189dea77ea53d294ba31ecab1f175538950a16f0 (patch) | |
| tree | 81adea1fb52caf374381de2962c2039aab5b72cb | |
| parent | * options: Remove emulate-md-encode-bug. (diff) | |
| download | gnupg-189dea77ea53d294ba31ecab1f175538950a16f0.tar.gz gnupg-189dea77ea53d294ba31ecab1f175538950a16f0.zip | |
* g10.c (strusage, main): Show development version warning in --version
output. (main): Set --bzip2-compress-level to the default value at
startup. Remove --emulate-checksum-bug noop.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/g10.c | 32 |
2 files changed, 30 insertions, 7 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 2289b8ad6..5b96be88e 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,10 @@ 2003-12-03 David Shaw <[email protected]> + * g10.c (strusage, main): Show development version warning in + --version output. + (main): Set --bzip2-compress-level to the default value at + startup. Remove --emulate-checksum-bug noop. + * options.h, g10.c (main), main.h, seskey.c (do_encode_md, encode_md_value), sig-check.c (do_check), sign.c (do_sign): Remove --emulate-md-encode-bug as it only applied to Elgamal signatures, @@ -222,7 +222,6 @@ enum cmd_and_opt_values oAlwaysTrust, oTrustModel, oForceOwnertrust, - oEmuChecksumBug, oRunAsShmCP, oSetFilename, oForYourEyesOnly, @@ -566,7 +565,6 @@ static ARGPARSE_OPTS opts[] = { { oAlwaysTrust, "always-trust", 0, "@"}, { oTrustModel, "trust-model", 2, "@"}, { oForceOwnertrust, "force-ownertrust", 2, "@"}, - { oEmuChecksumBug, "emulate-checksum-bug", 0, "@"}, { oRunAsShmCP, "run-as-shm-coprocess", 4, "@" }, { oSetFilename, "set-filename", 2, "@" }, { oForYourEyesOnly, "for-your-eyes-only", 0, "@" }, @@ -694,6 +692,19 @@ strusage( int level ) case 19: p = _("Please report bugs to <[email protected]>.\n"); break; + +#ifdef IS_DEVELOPMENT_VERSION + case 20: + p="NOTE: THIS IS A DEVELOPMENT VERSION!"; + break; + case 21: + p="It is only intended for test purposes and should NOT be"; + break; + case 22: + p="used in a production environment or with production keys!"; + break; +#endif + case 1: case 40: p = _("Usage: gpg [options] [files] (-h for help)"); @@ -1198,6 +1209,7 @@ main( int argc, char **argv ) i18n_init(); opt.command_fd = -1; /* no command fd */ opt.compress_level = -1; /* defaults to standard compress level */ + opt.bz2_compress_level = -1; /* defaults to standard compress level */ /* note: if you change these lines, look at oOpenPGP */ opt.def_cipher_algo = 0; opt.def_digest_algo = 0; @@ -2071,11 +2083,17 @@ main( int argc, char **argv ) fprintf(stderr, "%s\n", strusage(15) ); } #ifdef IS_DEVELOPMENT_VERSION - if( !opt.batch ) { - log_info("NOTE: THIS IS A DEVELOPMENT VERSION!\n"); - log_info("It is only intended for test purposes and should NOT be\n"); - log_info("used in a production environment or with production keys!\n"); - } + if( !opt.batch ) + { + const char *s; + + if((s=strusage(20))) + log_info("%s\n",s); + if((s=strusage(21))) + log_info("%s\n",s); + if((s=strusage(22))) + log_info("%s\n",s); + } #endif if (opt.verbose > 2) |