aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/armor.c2
-rw-r--r--g10/gpg.c18
-rw-r--r--g10/gpgv.c4
-rw-r--r--g10/keygen.c6
-rw-r--r--g10/keyring.c2
-rw-r--r--g10/openfile.c7
-rw-r--r--g10/server.c2
-rw-r--r--g10/sign.c3
-rw-r--r--g10/tdbio.c6
9 files changed, 26 insertions, 24 deletions
diff --git a/g10/armor.c b/g10/armor.c
index 43ebb2e78..9a43389cf 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -1079,7 +1079,7 @@ armor_filter( void *opaque, int control,
iobuf_writestr(a,afx->eol);
if( !opt.no_version )
{
- iobuf_writestr(a, "Version: GnuPG v" VERSION " ("
+ iobuf_writestr(a, "Version: "GNUPG_NAME" v" VERSION " ("
PRINTABLE_OS_NAME ")" );
iobuf_writestr(a,afx->eol);
}
diff --git a/g10/gpg.c b/g10/gpg.c
index 599948f99..8e0aed0a5 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -819,7 +819,7 @@ my_strusage( int level )
const char *p;
switch( level ) {
- case 11: p = "gpg (GnuPG)";
+ case 11: p = "@GPG@ (@GNUPG@)";
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
@@ -845,10 +845,10 @@ my_strusage( int level )
case 1:
case 40: p =
- _("Usage: gpg [options] [files] (-h for help)");
+ _("Usage: @GPG@ [options] [files] (-h for help)");
break;
case 41: p =
- _("Syntax: gpg [options] [files]\n"
+ _("Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
"Default operation depends on the input data\n");
break;
@@ -1833,8 +1833,8 @@ char *
get_default_configname (void)
{
char *configname = NULL;
- char *name = xstrdup ("gpg" EXTSEP_S "conf-" SAFE_VERSION);
- char *ver = &name[strlen ("gpg" EXTSEP_S "conf-")];
+ char *name = xstrdup (GPG_NAME EXTSEP_S "conf-" SAFE_VERSION);
+ char *ver = &name[strlen (GPG_NAME EXTSEP_S "conf-")];
do
{
@@ -1860,7 +1860,7 @@ get_default_configname (void)
xfree(name);
if (! configname)
- configname = make_filename (opt.homedir, "gpg" EXTSEP_S "conf", NULL);
+ configname = make_filename (opt.homedir, GPG_NAME EXTSEP_S "conf", NULL);
if (! access (configname, R_OK))
{
/* Print a warning when both config files are present. */
@@ -1942,12 +1942,12 @@ main (int argc, char **argv)
/* Please note that we may running SUID(ROOT), so be very CAREFUL
when adding any stuff between here and the call to
secmem_init() somewhere after the option parsing. */
- gnupg_reopen_std ("gpg");
+ gnupg_reopen_std (GPG_NAME);
trap_unaligned ();
gnupg_rl_initialize ();
set_strusage (my_strusage);
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
- log_set_prefix ("gpg", 1);
+ log_set_prefix (GPG_NAME, 1);
/* Make sure that our subsystems are ready. */
i18n_init();
@@ -3418,7 +3418,7 @@ main (int argc, char **argv)
|| (cmd != aDeArmor && cmd != aEnArmor && cmd != aGPGConfTest) )
{
if (!nrings || default_keyring) /* Add default ring. */
- keydb_add_resource ("pubring" EXTSEP_S "gpg",
+ keydb_add_resource ("pubring" EXTSEP_S GPGEXT_GPG,
KEYDB_RESOURCE_FLAG_DEFAULT);
for (sl = nrings; sl; sl = sl->next )
keydb_add_resource (sl->d, sl->flags);
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 5cb9c55b5..c11d9d3d1 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -108,7 +108,7 @@ my_strusage( int level )
switch (level)
{
- case 11: p = "gpgv (GnuPG)";
+ case 11: p = "@GPG@v (GnuPG)";
break;
case 13: p = VERSION; break;
case 17: p = PRINTABLE_OS_NAME; break;
@@ -198,7 +198,7 @@ main( int argc, char **argv )
/* Note: We open all keyrings in read-only mode. */
if (!nrings) /* No keyring given: use default one. */
- keydb_add_resource ("trustedkeys" EXTSEP_S "gpg",
+ keydb_add_resource ("trustedkeys" EXTSEP_S GPGEXT_GPG,
KEYDB_RESOURCE_FLAG_READONLY);
for (sl = nrings; sl; sl = sl->next)
keydb_add_resource (sl->d, KEYDB_RESOURCE_FLAG_READONLY);
diff --git a/g10/keygen.c b/g10/keygen.c
index 9c371bd1a..4bb8bbaed 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2088,7 +2088,7 @@ ask_curve (void)
continue;
curves[idx].available = 1;
- tty_printf (_(" (%d) %s\n"), idx + 1,
+ tty_printf (" (%d) %s\n", idx + 1,
curves[idx].pretty_name?
curves[idx].pretty_name:curves[idx].name);
}
@@ -2337,9 +2337,9 @@ ask_user_id (int mode, KBNODE keyblock)
{
/* TRANSLATORS: This is the new string telling the user what
gpg is now going to do (i.e. ask for the parts of the user
- ID). Note that if you do not tyranslated this string, a
+ ID). Note that if you do not translate this string, a
different string will be used used, which might still have
- a correct transaltion. */
+ a correct translation. */
const char *s1 =
N_("\n"
"GnuPG needs to construct a user ID to identify your key.\n"
diff --git a/g10/keyring.c b/g10/keyring.c
index ae02f9d78..04f6eeb22 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -1171,7 +1171,7 @@ create_tmp_file (const char *template,
* works. So we replace .gpg by .bak or .tmp
*/
if (strlen (template) > 4
- && !strcmp (template+strlen(template)-4, EXTSEP_S "gpg") )
+ && !strcmp (template+strlen(template)-4, EXTSEP_S GPGEXT_GPG) )
{
bakfname = xmalloc (strlen (template) + 1);
strcpy (bakfname, template);
diff --git a/g10/openfile.c b/g10/openfile.c
index 704dcff5b..119c5670d 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -105,7 +105,7 @@ make_outfile_name( const char *iname )
return xstrdup("-");
n = strlen(iname);
- if( n > 4 && ( !CMP_FILENAME(iname+n-4, EXTSEP_S "gpg")
+ if( n > 4 && ( !CMP_FILENAME(iname+n-4, EXTSEP_S GPGEXT_GPG)
|| !CMP_FILENAME(iname+n-4, EXTSEP_S "pgp")
|| !CMP_FILENAME(iname+n-4, EXTSEP_S "sig")
|| !CMP_FILENAME(iname+n-4, EXTSEP_S "asc") ) ) {
@@ -255,7 +255,8 @@ open_outfile (int inp_fd, const char *iname, int mode, iobuf_t *a)
{
buf = xstrconcat (iname,
(mode==1 ? EXTSEP_S "asc" :
- mode==2 ? EXTSEP_S "sig" : EXTSEP_S "gpg"),
+ mode==2 ? EXTSEP_S "sig" :
+ /* */ EXTSEP_S GPGEXT_GPG),
NULL);
}
name = buf;
@@ -369,7 +370,7 @@ copy_options_file( const char *destdir )
xfree(fname);
return;
}
- strcpy(stpcpy(fname, destdir), DIRSEP_S "gpg" EXTSEP_S "conf" );
+ strcpy(stpcpy(fname, destdir), DIRSEP_S GPGEXT_GPG EXTSEP_S "conf" );
oldmask=umask(077);
if ( is_secured_filename (fname) )
{
diff --git a/g10/server.c b/g10/server.c
index da9c28df4..8bf7a080a 100644
--- a/g10/server.c
+++ b/g10/server.c
@@ -709,7 +709,7 @@ gpg_server (ctrl_t ctrl)
if (opt.verbose || opt.debug)
{
char *tmp = NULL;
- const char *s1 = getenv ("GPG_AGENT_INFO");
+ const char *s1 = getenv (GPG_AGENT_INFO_NAME);
tmp = xtryasprintf ("Home: %s\n"
"Config: %s\n"
diff --git a/g10/sign.c b/g10/sign.c
index cfac5de76..e4d329067 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -1241,7 +1241,8 @@ clearsign_file( const char *fname, strlist_t locusr, const char *outfile )
if( opt.not_dash_escaped )
iobuf_writestr( out,
- "NotDashEscaped: You need GnuPG to verify this message" LF );
+ "NotDashEscaped: You need "GPG_NAME
+ " to verify this message" LF );
iobuf_writestr(out, LF );
if ( gcry_md_open (&textmd, 0, 0) )
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 43e04b755..0a659b141 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -491,7 +491,7 @@ tdbio_set_dbname( const char *new_dbname, int create )
}
if(new_dbname==NULL)
- fname=make_filename(opt.homedir,"trustdb" EXTSEP_S "gpg", NULL);
+ fname=make_filename(opt.homedir,"trustdb" EXTSEP_S GPGEXT_GPG, NULL);
else if (*new_dbname != DIRSEP_C )
{
if (strchr(new_dbname, DIRSEP_C) )
@@ -1239,7 +1239,7 @@ tdbio_read_record( ulong recnum, TRUSTREC *rec, int expected )
case 0: /* unused (free) record */
break;
case RECTYPE_VER: /* version record */
- if( memcmp(buf+1, "gpg", 3 ) ) {
+ if( memcmp(buf+1, GPGEXT_GPG, 3 ) ) {
log_error( _("%s: not a trustdb file\n"), db_name );
err = gpg_error (GPG_ERR_TRUSTDB);
}
@@ -1331,7 +1331,7 @@ tdbio_write_record( TRUSTREC *rec )
case RECTYPE_VER: /* version record */
if( recnum )
BUG();
- memcpy(p-1, "gpg", 3 ); p += 2;
+ memcpy(p-1, GPGEXT_GPG, 3 ); p += 2;
*p++ = rec->r.ver.version;
*p++ = rec->r.ver.marginals;
*p++ = rec->r.ver.completes;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 00:19:52 +0000