diff options
| author | Werner Koch <wk@gnupg.org> | 2007-08-10 18:52:05 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-08-10 18:52:05 +0200 |
| commit | 74d344a521c8a7a294b8da2cf2647e112fd5b310 (patch) | |
| tree | c2cc77b642ad52a26ea4d99a05f82f725f536d11 /jnlib | |
| parent | Factored common gpgconf constants out (diff) | |
| download | gnupg2-74d344a521c8a7a294b8da2cf2647e112fd5b310.tar.xz gnupg2-74d344a521c8a7a294b8da2cf2647e112fd5b310.zip | |
Implemented the chain model for X.509 validation.
Diffstat (limited to 'jnlib')
| -rw-r--r-- | jnlib/ChangeLog | 5 | ||||
| -rw-r--r-- | jnlib/argparse.c | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog index 4fec67999..c7722876b 100644 --- a/jnlib/ChangeLog +++ b/jnlib/ChangeLog @@ -1,3 +1,8 @@ +2007-08-09 Werner Koch <wk@g10code.com> + + * argparse.c (show_help): Expand the @EMAIL@ macro in the package + bug reporting address. + 2007-08-02 Werner Koch <wk@g10code.com> * t-stringhelp.c (test_compare_filenames): New. diff --git a/jnlib/argparse.c b/jnlib/argparse.c index 78ff3a46d..2d46884f0 100644 --- a/jnlib/argparse.c +++ b/jnlib/argparse.c @@ -832,8 +832,21 @@ show_help( ARGPARSE_OPTS *opts, unsigned flags ) puts("\n(A single dash may be used instead of the double ones)"); } if( (s=strusage(19)) ) { /* bug reports to ... */ + char *s2; + putchar('\n'); - fputs(s, stdout); + s2 = strstr (s, "@EMAIL@"); + if (s2) + { + if (s2-s) + fwrite (s, s2-s, 1, stdout); + fputs (PACKAGE_BUGREPORT, stdout); + s2 += 7; + if (*s2) + fputs (s2, stdout); + } + else + fputs(s, stdout); } fflush(stdout); exit(0); |