diff options
| author | Werner Koch <[email protected]> | 2013-11-18 13:09:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-11-18 13:09:47 +0000 |
| commit | cc9a0b69b698ba436eaf777e5020532845b56236 (patch) | |
| tree | cb2274c3d97fffa7020cb1e5a56373935ee094b2 /sm | |
| parent | Add strusage macro replacement feature. (diff) | |
| download | gnupg-cc9a0b69b698ba436eaf777e5020532845b56236.tar.gz gnupg-cc9a0b69b698ba436eaf777e5020532845b56236.zip | |
Make use of the *_NAME etc macros.
Replace hardwired strings at many places with new macros from config.h
and use the new strusage macro replacement feature.
* common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn
sentinels.
* agent/command.c (cmd_import_key): Use asprintf to create the prompt.
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/gpgsm.c | 6 | ||||
| -rw-r--r-- | sm/server.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index fa56a39f5..bf5b10243 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -524,17 +524,17 @@ my_strusage( int level ) switch (level) { - case 11: p = "gpgsm (GnuPG)"; + case 11: p = "@GPGSM@ (@GNUPG@)"; break; case 13: p = VERSION; break; case 17: p = PRINTABLE_OS_NAME; break; case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break; case 1: - case 40: p = _("Usage: gpgsm [options] [files] (-h for help)"); + case 40: p = _("Usage: @GPGSM@ [options] [files] (-h for help)"); break; case 41: - p = _("Syntax: gpgsm [options] [files]\n" + p = _("Syntax: @GPGSM@ [options] [files]\n" "Sign, check, encrypt or decrypt using the S/MIME protocol\n" "Default operation depends on the input data\n"); break; diff --git a/sm/server.c b/sm/server.c index 385eb538a..74caf6c5c 100644 --- a/sm/server.c +++ b/sm/server.c @@ -1294,7 +1294,7 @@ gpgsm_server (certlist_t default_recplist) if (opt.verbose || opt.debug) { char *tmp = NULL; - const char *s1 = getenv ("GPG_AGENT_INFO"); + const char *s1 = getenv (GPG_AGENT_INFO_NAME); if (asprintf (&tmp, "Home: %s\n" |