aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to 'agent')
-rw-r--r--agent/cache.c14
-rw-r--r--agent/call-pinentry.c4
-rw-r--r--agent/call-scd.c10
-rw-r--r--agent/command-ssh.c12
-rw-r--r--agent/divert-scd.c4
-rw-r--r--agent/findkey.c16
-rw-r--r--agent/gpg-agent.c38
-rw-r--r--agent/learncard.c2
-rw-r--r--agent/protect-tool.c10
-rw-r--r--agent/t-protect.c4
-rw-r--r--agent/trustlist.c28
11 files changed, 71 insertions, 71 deletions
diff --git a/agent/cache.c b/agent/cache.c
index 9b90d93f4..d4deaeb8c 100644
--- a/agent/cache.c
+++ b/agent/cache.c
@@ -218,7 +218,7 @@ housekeeping (void)
if (r->pw && r->ttl >= 0 && r->accessed + r->ttl < current)
{
if (DBG_CACHE)
- log_debug (" expired `%s' (%ds after last access)\n",
+ log_debug (" expired '%s' (%ds after last access)\n",
r->key, r->ttl);
release_data (r->pw);
r->pw = NULL;
@@ -240,7 +240,7 @@ housekeeping (void)
if (r->pw && r->created + maxttl < current)
{
if (DBG_CACHE)
- log_debug (" expired `%s' (%lus after creation)\n",
+ log_debug (" expired '%s' (%lus after creation)\n",
r->key, opt.max_cache_ttl);
release_data (r->pw);
r->pw = NULL;
@@ -256,7 +256,7 @@ housekeeping (void)
{
ITEM r2 = r->next;
if (DBG_CACHE)
- log_debug (" removed `%s' (mode %d) (slot not used for 30m)\n",
+ log_debug (" removed '%s' (mode %d) (slot not used for 30m)\n",
r->key, r->cache_mode);
xfree (r);
if (!rprev)
@@ -287,7 +287,7 @@ agent_flush_cache (void)
if (r->pw)
{
if (DBG_CACHE)
- log_debug (" flushing `%s'\n", r->key);
+ log_debug (" flushing '%s'\n", r->key);
release_data (r->pw);
r->pw = NULL;
r->accessed = 0;
@@ -311,7 +311,7 @@ agent_put_cache (const char *key, cache_mode_t cache_mode,
ITEM r;
if (DBG_CACHE)
- log_debug ("agent_put_cache `%s' (mode %d) requested ttl=%d\n",
+ log_debug ("agent_put_cache '%s' (mode %d) requested ttl=%d\n",
key, cache_mode, ttl);
housekeeping ();
@@ -393,7 +393,7 @@ agent_get_cache (const char *key, cache_mode_t cache_mode)
return NULL;
if (DBG_CACHE)
- log_debug ("agent_get_cache `%s' (mode %d) ...\n", key, cache_mode);
+ log_debug ("agent_get_cache '%s' (mode %d) ...\n", key, cache_mode);
housekeeping ();
for (r=thecache; r; r = r->next)
@@ -431,7 +431,7 @@ agent_get_cache (const char *key, cache_mode_t cache_mode)
{
xfree (value);
value = NULL;
- log_error ("retrieving cache entry `%s' failed: %s\n",
+ log_error ("retrieving cache entry '%s' failed: %s\n",
key, gpg_strerror (err));
}
return value;
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 34ab3840e..381d0f0a6 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -315,7 +315,7 @@ start_pinentry (ctrl_t ctrl)
ASSUAN_PIPE_CONNECT_DETACHED);
if (rc)
{
- log_error ("can't connect to the PIN entry module `%s': %s\n",
+ log_error ("can't connect to the PIN entry module '%s': %s\n",
opt.pinentry_program, gpg_strerror (rc));
assuan_release (ctx);
return unlock_pinentry (gpg_error (GPG_ERR_NO_PIN_ENTRY));
@@ -622,7 +622,7 @@ inq_quality (void *opaque, const char *line)
}
else
{
- log_error ("unsupported inquiry `%s' from pinentry\n", line);
+ log_error ("unsupported inquiry '%s' from pinentry\n", line);
rc = gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
}
diff --git a/agent/call-scd.c b/agent/call-scd.c
index f9ededb72..8fc00542e 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -148,7 +148,7 @@ agent_scd_dump_state (void)
(long)assuan_get_pid (primary_scd_ctx),
primary_scd_ctx_reusable);
if (socket_name)
- log_info ("agent_scd_dump_state: socket=`%s'\n", socket_name);
+ log_info ("agent_scd_dump_state: socket='%s'\n", socket_name);
}
@@ -268,7 +268,7 @@ start_scd (ctrl_t ctrl)
rc = assuan_socket_connect (ctx, socket_name, 0, 0);
if (rc)
{
- log_error ("can't connect to socket `%s': %s\n",
+ log_error ("can't connect to socket '%s': %s\n",
socket_name, gpg_strerror (rc));
err = gpg_error (GPG_ERR_NO_SCDAEMON);
goto leave;
@@ -366,7 +366,7 @@ start_scd (ctrl_t ctrl)
memcpy (socket_name, databuf, datalen);
socket_name[datalen] = 0;
if (DBG_ASSUAN)
- log_debug ("additional connections at `%s'\n", socket_name);
+ log_debug ("additional connections at '%s'\n", socket_name);
}
}
xfree (databuf);
@@ -763,12 +763,12 @@ inq_needpin (void *opaque, const char *line)
xfree (value);
}
else
- log_error ("error forwarding inquiry `%s': %s\n",
+ log_error ("error forwarding inquiry '%s': %s\n",
line, gpg_strerror (rc));
}
else
{
- log_error ("unsupported inquiry `%s'\n", line);
+ log_error ("unsupported inquiry '%s'\n", line);
rc = gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
}
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 54e56eac0..ddf8e2cf6 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -684,7 +684,7 @@ open_control_file (FILE **r_fp, int append)
if (!stream)
{
err = gpg_error_from_syserror ();
- log_error (_("can't create `%s': %s\n"), fname, gpg_strerror (err));
+ log_error (_("can't create '%s': %s\n"), fname, gpg_strerror (err));
xfree (fname);
return err;
}
@@ -696,7 +696,7 @@ open_control_file (FILE **r_fp, int append)
if (!fp)
{
err = gpg_error (gpg_err_code_from_errno (errno));
- log_error (_("can't open `%s': %s\n"), fname, gpg_strerror (err));
+ log_error (_("can't open '%s': %s\n"), fname, gpg_strerror (err));
xfree (fname);
return err;
}
@@ -769,7 +769,7 @@ search_control_file (FILE *fp, const char *hexgrip,
goto next_line;
if (i != 40 || !(spacep (p) || *p == '\n'))
{
- log_error ("invalid formatted line in `%s', line %d\n", fname, lnr);
+ log_error ("invalid formatted line in '%s', line %d\n", fname, lnr);
return gpg_error (GPG_ERR_BAD_DATA);
}
@@ -777,7 +777,7 @@ search_control_file (FILE *fp, const char *hexgrip,
p = pend;
if (!(spacep (p) || *p == '\n') || ttl < -1)
{
- log_error ("invalid TTL value in `%s', line %d; assuming 0\n",
+ log_error ("invalid TTL value in '%s', line %d; assuming 0\n",
fname, lnr);
ttl = 0;
}
@@ -795,7 +795,7 @@ search_control_file (FILE *fp, const char *hexgrip,
if (p[n] == '=')
{
log_error ("assigning a value to a flag is not yet supported; "
- "in `%s', line %d; flag ignored\n", fname, lnr);
+ "in '%s', line %d; flag ignored\n", fname, lnr);
p++;
}
else if (n == 7 && !memcmp (p, "confirm", 7))
@@ -804,7 +804,7 @@ search_control_file (FILE *fp, const char *hexgrip,
*r_confirm = 1;
}
else
- log_error ("invalid flag `%.*s' in `%s', line %d; ignored\n",
+ log_error ("invalid flag '%.*s' in '%s', line %d; ignored\n",
n, p, fname, lnr);
p += n;
}
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index 22cdf8ed9..656d5cdf1 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -312,9 +312,9 @@ getpin_cb (void *opaque, const char *info, char *buf, size_t maxbuf)
char *desc;
if ( asprintf (&desc,
_("Please enter the PIN%s%s%s to unlock the card"),
- info? " (`":"",
+ info? " (":"",
info? info:"",
- info? "')":"") < 0)
+ info? ")":"") < 0)
desc = NULL;
rc = agent_askpin (ctrl, desc?desc:info, prompt, NULL, pi);
xfree (desc);
diff --git a/agent/findkey.c b/agent/findkey.c
index a03d0c423..0b57390eb 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -68,7 +68,7 @@ agent_write_private_key (const unsigned char *grip,
if (!force && !access (fname, F_OK))
{
- log_error ("secret key file `%s' already exists\n", fname);
+ log_error ("secret key file '%s' already exists\n", fname);
xfree (fname);
return gpg_error (GPG_ERR_EEXIST);
}
@@ -77,7 +77,7 @@ agent_write_private_key (const unsigned char *grip,
if (!fp)
{
gpg_error_t tmperr = gpg_error_from_syserror ();
- log_error ("can't create `%s': %s\n", fname, gpg_strerror (tmperr));
+ log_error ("can't create '%s': %s\n", fname, gpg_strerror (tmperr));
xfree (fname);
return tmperr;
}
@@ -85,7 +85,7 @@ agent_write_private_key (const unsigned char *grip,
if (es_fwrite (buffer, length, 1, fp) != 1)
{
gpg_error_t tmperr = gpg_error_from_syserror ();
- log_error ("error writing `%s': %s\n", fname, gpg_strerror (tmperr));
+ log_error ("error writing '%s': %s\n", fname, gpg_strerror (tmperr));
es_fclose (fp);
gnupg_remove (fname);
xfree (fname);
@@ -94,7 +94,7 @@ agent_write_private_key (const unsigned char *grip,
if (es_fclose (fp))
{
gpg_error_t tmperr = gpg_error_from_syserror ();
- log_error ("error closing `%s': %s\n", fname, gpg_strerror (tmperr));
+ log_error ("error closing '%s': %s\n", fname, gpg_strerror (tmperr));
gnupg_remove (fname);
xfree (fname);
return tmperr;
@@ -478,7 +478,7 @@ read_key_file (const unsigned char *grip, gcry_sexp_t *result)
{
rc = gpg_error_from_syserror ();
if (gpg_err_code (rc) != GPG_ERR_ENOENT)
- log_error ("can't open `%s': %s\n", fname, strerror (errno));
+ log_error ("can't open '%s': %s\n", fname, strerror (errno));
xfree (fname);
return rc;
}
@@ -486,7 +486,7 @@ read_key_file (const unsigned char *grip, gcry_sexp_t *result)
if (fstat (es_fileno (fp), &st))
{
rc = gpg_error_from_syserror ();
- log_error ("can't stat `%s': %s\n", fname, strerror (errno));
+ log_error ("can't stat '%s': %s\n", fname, strerror (errno));
xfree (fname);
es_fclose (fp);
return rc;
@@ -497,7 +497,7 @@ read_key_file (const unsigned char *grip, gcry_sexp_t *result)
if (!buf)
{
rc = gpg_error_from_syserror ();
- log_error ("error allocating %zu bytes for `%s': %s\n",
+ log_error ("error allocating %zu bytes for '%s': %s\n",
buflen, fname, strerror (errno));
xfree (fname);
es_fclose (fp);
@@ -509,7 +509,7 @@ read_key_file (const unsigned char *grip, gcry_sexp_t *result)
if (es_fread (buf, buflen, 1, fp) != 1)
{
rc = gpg_error_from_syserror ();
- log_error ("error reading %zu bytes from `%s': %s\n",
+ log_error ("error reading %zu bytes from '%s': %s\n",
buflen, fname, strerror (errno));
xfree (fname);
es_fclose (fp);
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index b6bf71edc..b117849c5 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -394,7 +394,7 @@ set_debug (void)
}
else
{
- log_error (_("invalid debug-level `%s' given\n"), debug_level);
+ log_error (_("invalid debug-level '%s' given\n"), debug_level);
opt.debug = 0; /* Reset debugging, so that prior debug
statements won't have an undesired effect. */
}
@@ -727,7 +727,7 @@ main (int argc, char **argv )
if (default_config)
{
if( parse_debug )
- log_info (_("NOTE: no default option file `%s'\n"),
+ log_info (_("NOTE: no default option file '%s'\n"),
configname );
/* Save the default conf file name so that
reread_configuration is able to test whether the
@@ -738,7 +738,7 @@ main (int argc, char **argv )
}
else
{
- log_error (_("option file `%s': %s\n"),
+ log_error (_("option file '%s': %s\n"),
configname, strerror(errno) );
exit(2);
}
@@ -746,7 +746,7 @@ main (int argc, char **argv )
configname = NULL;
}
if (parse_debug && configname )
- log_info (_("reading options from `%s'\n"), configname );
+ log_info (_("reading options from '%s'\n"), configname );
default_config = 0;
}
@@ -858,7 +858,7 @@ main (int argc, char **argv )
for (i=0; i < argc; i++)
if (argv[i][0] == '-' && argv[i][1] == '-')
- log_info (_("NOTE: `%s' is not considered an option\n"), argv[i]);
+ log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
}
#ifdef ENABLE_NLS
@@ -1117,7 +1117,7 @@ main (int argc, char **argv )
fp = es_fopen (env_file_name, "w,mode=-rw");
if (!fp)
- log_error (_("error creating `%s': %s\n"),
+ log_error (_("error creating '%s': %s\n"),
env_file_name, strerror (errno));
else
{
@@ -1213,7 +1213,7 @@ main (int argc, char **argv )
if ( ! close (i)
&& open ("/dev/null", i? O_WRONLY : O_RDONLY) == -1)
{
- log_error ("failed to open `%s': %s\n",
+ log_error ("failed to open '%s': %s\n",
"/dev/null", strerror (errno));
cleanup ();
exit (1);
@@ -1352,7 +1352,7 @@ reread_configuration (void)
fp = fopen (config_filename, "r");
if (!fp)
{
- log_info (_("option file `%s': %s\n"),
+ log_info (_("option file '%s': %s\n"),
config_filename, strerror(errno) );
return;
}
@@ -1472,7 +1472,7 @@ create_socket_name (char *standard_name, char *template)
*p = 0;
if (!mkdtemp (name))
{
- log_error (_("can't create directory `%s': %s\n"),
+ log_error (_("can't create directory '%s': %s\n"),
name, strerror (errno));
agent_exit (2);
}
@@ -1481,7 +1481,7 @@ create_socket_name (char *standard_name, char *template)
if (strchr (name, PATHSEP_C))
{
- log_error (("`%s' are not allowed in the socket name\n"), PATHSEP_S);
+ log_error (("'%s' are not allowed in the socket name\n"), PATHSEP_S);
agent_exit (2);
}
if (strlen (name) + 1 >= DIMof (struct sockaddr_un, sun_path) )
@@ -1518,7 +1518,7 @@ create_server_socket (char *name, int is_ssh, assuan_sock_nonce_t *nonce)
serv_addr->sun_family = AF_UNIX;
if (strlen (name) + 1 >= sizeof (serv_addr->sun_path))
{
- log_error (_("socket name `%s' is too long\n"), name);
+ log_error (_("socket name '%s' is too long\n"), name);
agent_exit (2);
}
strcpy (serv_addr->sun_path, name);
@@ -1562,7 +1562,7 @@ create_server_socket (char *name, int is_ssh, assuan_sock_nonce_t *nonce)
{
/* We use gpg_strerror here because it allows us to get strings
for some W32 socket error codes. */
- log_error (_("error binding socket to `%s': %s\n"),
+ log_error (_("error binding socket to '%s': %s\n"),
serv_addr->sun_path,
gpg_strerror (gpg_error_from_errno (errno)));
@@ -1580,7 +1580,7 @@ create_server_socket (char *name, int is_ssh, assuan_sock_nonce_t *nonce)
}
if (opt.verbose)
- log_info (_("listening on socket `%s'\n"), serv_addr->sun_path);
+ log_info (_("listening on socket '%s'\n"), serv_addr->sun_path);
return fd;
}
@@ -1599,10 +1599,10 @@ create_private_keys_directory (const char *home)
if (stat (fname, &statbuf) && errno == ENOENT)
{
if (gnupg_mkdir (fname, "-rwx"))
- log_error (_("can't create directory `%s': %s\n"),
+ log_error (_("can't create directory '%s': %s\n"),
fname, strerror (errno) );
else if (!opt.quiet)
- log_info (_("directory `%s' created\n"), fname);
+ log_info (_("directory '%s' created\n"), fname);
}
xfree (fname);
}
@@ -1638,22 +1638,22 @@ create_directories (void)
)
{
if (gnupg_mkdir (home, "-rwx"))
- log_error (_("can't create directory `%s': %s\n"),
+ log_error (_("can't create directory '%s': %s\n"),
home, strerror (errno) );
else
{
if (!opt.quiet)
- log_info (_("directory `%s' created\n"), home);
+ log_info (_("directory '%s' created\n"), home);
create_private_keys_directory (home);
}
}
}
else
- log_error (_("stat() failed for `%s': %s\n"), home, strerror (errno));
+ log_error (_("stat() failed for '%s': %s\n"), home, strerror (errno));
}
else if ( !S_ISDIR(statbuf.st_mode))
{
- log_error (_("can't use `%s' as home directory\n"), home);
+ log_error (_("can't use '%s' as home directory\n"), home);
}
else /* exists and is a directory. */
{
diff --git a/agent/learncard.c b/agent/learncard.c
index 05476f617..c60b3f48d 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -275,7 +275,7 @@ send_cert_back (ctrl_t ctrl, const char *id, void *assuan_context)
break;
}
if (opt.verbose || !*action)
- log_info ("error reading certificate `%s': %s%s\n",
+ log_info ("error reading certificate '%s': %s%s\n",
id? id:"?", gpg_strerror (rc), action);
return *action? 0 : rc;
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index 57842a083..d59f5f0fa 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -191,7 +191,7 @@ make_canonical (const char *fname, const char *buf, size_t buflen)
rc = gcry_sexp_sscan (&sexp, &erroff, buf, buflen);
if (rc)
{
- log_error ("invalid S-Expression in `%s' (off=%u): %s\n",
+ log_error ("invalid S-Expression in '%s' (off=%u): %s\n",
fname, (unsigned int)erroff, gpg_strerror (rc));
return NULL;
}
@@ -258,7 +258,7 @@ read_file (const char *fname, size_t *r_length)
nread = fread (buf+buflen, 1, NCHUNK, fp);
if (nread < NCHUNK && ferror (fp))
{
- log_error ("error reading `[stdin]': %s\n", strerror (errno));
+ log_error ("error reading '[stdin]': %s\n", strerror (errno));
xfree (buf);
return NULL;
}
@@ -275,13 +275,13 @@ read_file (const char *fname, size_t *r_length)
fp = fopen (fname, "rb");
if (!fp)
{
- log_error ("can't open `%s': %s\n", fname, strerror (errno));
+ log_error ("can't open '%s': %s\n", fname, strerror (errno));
return NULL;
}
if (fstat (fileno(fp), &st))
{
- log_error ("can't stat `%s': %s\n", fname, strerror (errno));
+ log_error ("can't stat '%s': %s\n", fname, strerror (errno));
fclose (fp);
return NULL;
}
@@ -290,7 +290,7 @@ read_file (const char *fname, size_t *r_length)
buf = xmalloc (buflen+1);
if (fread (buf, buflen, 1, fp) != 1)
{
- log_error ("error reading `%s': %s\n", fname, strerror (errno));
+ log_error ("error reading '%s': %s\n", fname, strerror (errno));
fclose (fp);
xfree (buf);
return NULL;
diff --git a/agent/t-protect.c b/agent/t-protect.c
index 4b6e0b48c..67a60a897 100644
--- a/agent/t-protect.c
+++ b/agent/t-protect.c
@@ -107,7 +107,7 @@ test_agent_protect (void)
"\xA4\x44\x3B\xA5\x3A\x52\xFC\xA8\x17\x3D\xE6\xE8\x5B\x42\xF9\x78\x3D\x4A\x78\x17"
"\xD0\x68\x0B\x29\x29\x00"
};
- /* This RSA key is the `e' value. */
+ /* This RSA key is the 'e' value. */
struct key_spec key_rsa_bogus_1 =
{
"\x28\x31\x31\x3A\x70\x72\x69\x76\x61\x74\x65\x2D\x6B\x65\x79\x28\x33\x3A\x72\x73"
@@ -177,7 +177,7 @@ test_agent_protect (void)
&specs[i].result, &specs[i].resultlen, 0);
if (gpg_err_code (ret) != specs[i].ret_expected)
{
- printf ("agent_protect() returned `%i/%s'; expected `%i/%s'\n",
+ printf ("agent_protect() returned '%i/%s'; expected '%i/%s'\n",
ret, gpg_strerror (ret),
specs[i].ret_expected, gpg_strerror (specs[i].ret_expected));
abort ();
diff --git a/agent/trustlist.c b/agent/trustlist.c
index f92ad3053..7829f01c8 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -151,7 +151,7 @@ read_one_trustfile (const char *fname, int allow_include,
if (!fp)
{
err = gpg_error_from_syserror ();
- log_error (_("error opening `%s': %s\n"), fname, gpg_strerror (err));
+ log_error (_("error opening '%s': %s\n"), fname, gpg_strerror (err));
goto leave;
}
@@ -167,7 +167,7 @@ read_one_trustfile (const char *fname, int allow_include,
;
err = gpg_error (*line? GPG_ERR_LINE_TOO_LONG
: GPG_ERR_INCOMPLETE_LINE);
- log_error (_("file `%s', line %d: %s\n"),
+ log_error (_("file '%s', line %d: %s\n"),
fname, lnr, gpg_strerror (err));
continue;
}
@@ -189,7 +189,7 @@ read_one_trustfile (const char *fname, int allow_include,
if (!allow_include)
{
- log_error (_("statement \"%s\" ignored in `%s', line %d\n"),
+ log_error (_("statement \"%s\" ignored in '%s', line %d\n"),
"include-default", fname, lnr);
continue;
}
@@ -197,13 +197,13 @@ read_one_trustfile (const char *fname, int allow_include,
etcname = make_filename (gnupg_sysconfdir (), "trustlist.txt", NULL);
if ( !strcmp (etcname, fname) ) /* Same file. */
- log_info (_("statement \"%s\" ignored in `%s', line %d\n"),
+ log_info (_("statement \"%s\" ignored in '%s', line %d\n"),
"include-default", fname, lnr);
else if ( access (etcname, F_OK) && errno == ENOENT )
{
/* A non existent system trustlist is not an error.
Just print a note. */
- log_info (_("system trustlist `%s' not available\n"), etcname);
+ log_info (_("system trustlist '%s' not available\n"), etcname);
}
else
{
@@ -247,7 +247,7 @@ read_one_trustfile (const char *fname, int allow_include,
n = hexcolon2bin (p, ti->fpr, 20);
if (n < 0)
{
- log_error (_("bad fingerprint in `%s', line %d\n"), fname, lnr);
+ log_error (_("bad fingerprint in '%s', line %d\n"), fname, lnr);
err = gpg_error (GPG_ERR_BAD_DATA);
continue;
}
@@ -272,14 +272,14 @@ read_one_trustfile (const char *fname, int allow_include,
}
else
{
- log_error (_("invalid keyflag in `%s', line %d\n"), fname, lnr);
+ log_error (_("invalid keyflag in '%s', line %d\n"), fname, lnr);
err = gpg_error (GPG_ERR_BAD_DATA);
continue;
}
p++;
if ( *p && !spacep (p) )
{
- log_error (_("invalid keyflag in `%s', line %d\n"), fname, lnr);
+ log_error (_("invalid keyflag in '%s', line %d\n"), fname, lnr);
err = gpg_error (GPG_ERR_BAD_DATA);
continue;
}
@@ -295,7 +295,7 @@ read_one_trustfile (const char *fname, int allow_include,
if (p[n] == '=')
{
log_error ("assigning a value to a flag is not yet supported; "
- "in `%s', line %d\n", fname, lnr);
+ "in '%s', line %d\n", fname, lnr);
err = gpg_error (GPG_ERR_BAD_DATA);
p++;
}
@@ -304,7 +304,7 @@ read_one_trustfile (const char *fname, int allow_include,
else if (n == 2 && !memcmp (p, "cm", 2))
ti->flags.cm = 1;
else
- log_error ("flag `%.*s' in `%s', line %d ignored\n",
+ log_error ("flag '%.*s' in '%s', line %d ignored\n",
n, p, fname, lnr);
p += n;
}
@@ -313,7 +313,7 @@ read_one_trustfile (const char *fname, int allow_include,
if ( !err && !es_feof (fp) )
{
err = gpg_error_from_syserror ();
- log_error (_("error reading `%s', line %d: %s\n"),
+ log_error (_("error reading '%s', line %d: %s\n"),
fname, lnr, gpg_strerror (err));
}
@@ -352,7 +352,7 @@ read_trustfiles (void)
else
{
err = gpg_error_from_syserror ();
- log_error (_("error opening `%s': %s\n"), fname, gpg_strerror (err));
+ log_error (_("error opening '%s': %s\n"), fname, gpg_strerror (err));
}
xfree (fname);
fname = make_filename (gnupg_sysconfdir (), "trustlist.txt", NULL);
@@ -740,7 +740,7 @@ agent_marktrusted (ctrl_t ctrl, const char *name, const char *fpr, int flag)
if (!fp)
{
err = gpg_error_from_syserror ();
- log_error ("can't create `%s': %s\n", fname, gpg_strerror (err));
+ log_error ("can't create '%s': %s\n", fname, gpg_strerror (err));
xfree (fname);
unlock_trusttable ();
xfree (fprformatted);
@@ -754,7 +754,7 @@ agent_marktrusted (ctrl_t ctrl, const char *name, const char *fpr, int flag)
if (!fp)
{
err = gpg_error_from_syserror ();
- log_error ("can't open `%s': %s\n", fname, gpg_strerror (err));
+ log_error ("can't open '%s': %s\n", fname, gpg_strerror (err));
xfree (fname);
unlock_trusttable ();
xfree (fprformatted);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 20:55:32 +0000