security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Change all quotes in strings and comments to the new GNU standard.

Browse source 
The asymmetric quotes used by GNU in the past (`...') don't render
nicely on modern systems.  We now use two \x27 characters ('...').

The proper solution would be to use the correct Unicode symmetric
quotes here.  However this has the disadvantage that the system
requires Unicode support.  We don't want that today.  If Unicode is
available a generated po file can be used to output proper quotes.  A
simple sed script like the one used for en@quote is sufficient to
change them.

The changes have been done by applying

  sed -i "s/\`\([^'\`]*\)'/'\1'/g"

to most files and fixing obvious problems by hand.  The msgid strings in
the po files were fixed with a similar command.
This commit is contained in:
Werner Koch 2012-06-05 19:29:22 +02:00
parent fc00d3fcb2
commit 096e7457ec
175 changed files with 4857 additions and 4869 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/argparse.c
View file

@ -1269,7 +1269,7 @@ main(int argc, char **argv)
while( arg_parse ( &pargs, opts) ) {
switch( pargs.r_opt ) {
case -1 : printf( "arg=`%s'\n", pargs.r.ret_str); break;
case -1 : printf( "arg='%s'\n", pargs.r.ret_str); break;
case 'v': opt.verbose++; break;
case 'e': opt.echo++; break;
case 'd': opt.debug++; break;
@ -1288,9 +1288,9 @@ main(int argc, char **argv)
if( opt.debug )
printf(" debug=%d\n", opt.debug );
if( opt.outfile )
printf(" outfile=`%s'\n", opt.outfile );
printf(" outfile='%s'\n", opt.outfile );
if( opt.crf )
printf(" crffile=`%s'\n", opt.crf );
printf(" crffile='%s'\n", opt.crf );
if( opt.myopt )
printf(" myopt=%d\n", opt.myopt );
if( opt.a_long_one )

14
common/asshelp.c
View file

@ -398,7 +398,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
agent_program = gnupg_module_name (GNUPG_MODULE_NAME_AGENT);
if (verbose)
log_info (_("no running gpg-agent - starting `%s'\n"),
log_info (_("no running gpg-agent - starting '%s'\n"),
agent_program);
if (status_cb)
@ -420,12 +420,12 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
argv[1] = NULL;
err = gnupg_spawn_process_fd (agent_program, argv, -1, -1, -1, &pid);
if (err)
log_debug ("starting `%s' for testing failed: %s\n",
log_debug ("starting '%s' for testing failed: %s\n",
agent_program, gpg_strerror (err));
else if ((err = gnupg_wait_process (agent_program, pid, 1, &excode)))
{
if (excode == -1)
log_debug ("running `%s' for testing failed (wait): %s\n",
log_debug ("running '%s' for testing failed (wait): %s\n",
agent_program, gpg_strerror (err));
}
gnupg_release_process (pid);
@ -447,7 +447,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
{
err = gnupg_spawn_process_detached (agent_program, argv,NULL);
if (err)
log_error ("failed to start agent `%s': %s\n",
log_error ("failed to start agent '%s': %s\n",
agent_program, gpg_strerror (err));
else
{
@ -616,7 +616,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
dirmngr_program = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR);
if (verbose)
log_info (_("no running Dirmngr - starting `%s'\n"),
log_info (_("no running Dirmngr - starting '%s'\n"),
dirmngr_program);
if (status_cb)
@ -641,7 +641,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
{
err = gnupg_spawn_process_detached (dirmngr_program, argv,NULL);
if (err)
log_error ("failed to start the dirmngr `%s': %s\n",
log_error ("failed to start the dirmngr '%s': %s\n",
dirmngr_program, gpg_strerror (err));
else
{
@ -681,7 +681,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
if (err)
{
log_error ("connecting dirmngr at `%s' failed: %s\n",
log_error ("connecting dirmngr at '%s' failed: %s\n",
sockname, gpg_strerror (err));
assuan_release (ctx);
return gpg_err_make (errsource, GPG_ERR_NO_DIRMNGR);

6
common/audit.c
View file

@ -1216,7 +1216,7 @@ audit_print_result (audit_ctx_t ctx, estream_t out, int use_html)
es_fprintf (out, " i=%d", ctx->log[idx].intvalue);
if (ctx->log[idx].string)
{
es_fputs (" s=`", out);
es_fputs (" s='", out);
writeout (ctx, ctx->log[idx].string);
es_fputs ("'", out);
}
@ -1224,7 +1224,7 @@ audit_print_result (audit_ctx_t ctx, estream_t out, int use_html)
es_fprintf (out, " has_cert");
if (ctx->log[idx].have_err)
{
es_fputs (" err=`", out);
es_fputs (" err='", out);
writeout (ctx, gpg_strerror (ctx->log[idx].err));
es_fputs ("'", out);
}
@ -1304,7 +1304,7 @@ audit_print_result (audit_ctx_t ctx, estream_t out, int use_html)
xfree (text);
}
else
writeout_para (ctx, _("No help available for `%s'."), helptag->name);
writeout_para (ctx, _("No help available for '%s'."), helptag->name);
if (use_html && ctx->helptags->next)
es_fputs ("</li>\n", ctx->outstream);
if (helptag->next)

34
common/dotlock.c
View file

@ -52,7 +52,7 @@
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
@ -497,7 +497,7 @@ read_lockfile (dotlock_t h, int *same_node )
if ( (fd = open (h->lockname, O_RDONLY)) == -1 )
{
int e = errno;
my_info_2 ("error opening lockfile `%s': %s\n",
my_info_2 ("error opening lockfile '%s': %s\n",
h->lockname, strerror(errno) );
if (buffer != buffer_space)
jnlib_free (buffer);
@ -514,7 +514,7 @@ read_lockfile (dotlock_t h, int *same_node )
continue;
if (res < 0)
{
my_info_1 ("error reading lockfile `%s'\n", h->lockname );
my_info_1 ("error reading lockfile '%s'\n", h->lockname );
close (fd);
if (buffer != buffer_space)
jnlib_free (buffer);
@ -529,7 +529,7 @@ read_lockfile (dotlock_t h, int *same_node )
if (nread < 11)
{
my_info_1 ("invalid size of lockfile `%s'\n", h->lockname);
my_info_1 ("invalid size of lockfile '%s'\n", h->lockname);
if (buffer != buffer_space)
jnlib_free (buffer);
jnlib_set_errno (0); /* Better don't return an inappropriate ERRNO. */
@ -540,7 +540,7 @@ read_lockfile (dotlock_t h, int *same_node )
|| (buffer[10] = 0, pid = atoi (buffer)) == -1
|| !pid )
{
my_error_2 ("invalid pid %d in lockfile `%s'\n", pid, h->lockname);
my_error_2 ("invalid pid %d in lockfile '%s'\n", pid, h->lockname);
if (buffer != buffer_space)
jnlib_free (buffer);
jnlib_set_errno (0);
@ -666,7 +666,7 @@ dotlock_create_unix (dotlock_t h, const char *file_to_lock)
{
all_lockfiles = h->next;
UNLOCK_all_lockfiles ();
my_error_2 (_("failed to create temporary file `%s': %s\n"),
my_error_2 (_("failed to create temporary file '%s': %s\n"),
h->tname, strerror(errno));
jnlib_free (h->tname);
jnlib_free (h);
@ -691,7 +691,7 @@ dotlock_create_unix (dotlock_t h, const char *file_to_lock)
h->use_o_excl = 1;
break;
default:
my_error_2 ("can't check whether hardlinks are supported for `%s': %s\n",
my_error_2 ("can't check whether hardlinks are supported for '%s': %s\n",
h->tname, strerror(errno));
goto write_failed;
}
@ -709,14 +709,14 @@ dotlock_create_unix (dotlock_t h, const char *file_to_lock)
strcpy (stpcpy (h->lockname, file_to_lock), EXTSEP_S "lock");
UNLOCK_all_lockfiles ();
if (h->use_o_excl)
my_debug_1 ("locking for `%s' done via O_EXCL\n", h->lockname);
my_debug_1 ("locking for '%s' done via O_EXCL\n", h->lockname);
return h;
write_failed:
all_lockfiles = h->next;
UNLOCK_all_lockfiles ();
my_error_2 (_("error writing to `%s': %s\n"), h->tname, strerror (errno));
my_error_2 (_("error writing to '%s': %s\n"), h->tname, strerror (errno));
close (fd);
unlink (h->tname);
jnlib_free (h->tname);
@ -780,7 +780,7 @@ dotlock_create_w32 (dotlock_t h, const char *file_to_lock)
{
all_lockfiles = h->next;
UNLOCK_all_lockfiles ();
my_error_2 (_("can't create `%s': %s\n"), h->lockname, w32_strerror (-1));
my_error_2 (_("can't create '%s': %s\n"), h->lockname, w32_strerror (-1));
jnlib_free (h->lockname);
jnlib_free (h);
return NULL;
@ -975,7 +975,7 @@ dotlock_take_unix (dotlock_t h, long timeout)
; /* Lock held by another process. */
else if (fd == -1)
{
my_error_2 ("lock not made: open(O_EXCL) of `%s' failed: %s\n",
my_error_2 ("lock not made: open(O_EXCL) of '%s' failed: %s\n",
h->lockname, strerror (errno));
return -1;
}
@ -994,7 +994,7 @@ dotlock_take_unix (dotlock_t h, long timeout)
return 0;
}
/* Write error. */
my_error_2 ("lock not made: writing to `%s' failed: %s\n",
my_error_2 ("lock not made: writing to '%s' failed: %s\n",
h->lockname, strerror (errno));
close (fd);
unlink (h->lockname);
@ -1123,7 +1123,7 @@ dotlock_take_w32 (dotlock_t h, long timeout)
w32err = GetLastError ();
if (w32err != ERROR_LOCK_VIOLATION)
{
my_error_2 (_("lock `%s' not made: %s\n"),
my_error_2 (_("lock '%s' not made: %s\n"),
h->lockname, w32_strerror (w32err));
return -1;
}
@ -1173,7 +1173,7 @@ dotlock_take (dotlock_t h, long timeout)
if ( h->locked )
{
my_debug_1 ("Oops, `%s' is already locked\n", h->lockname);
my_debug_1 ("Oops, '%s' is already locked\n", h->lockname);
return 0;
}
@ -1209,7 +1209,7 @@ dotlock_release_unix (dotlock_t h)
if ( unlink( h->lockname ) )
{
my_error_1 ("release_dotlock: error removing lockfile `%s'\n",
my_error_1 ("release_dotlock: error removing lockfile '%s'\n",
h->lockname);
return -1;
}
@ -1230,7 +1230,7 @@ dotlock_release_w32 (dotlock_t h)
memset (&ovl, 0, sizeof ovl);
if (!UnlockFileEx (h->lockhd, 0, 1, 0, &ovl))
{
my_error_2 ("release_dotlock: error removing lockfile `%s': %s\n",
my_error_2 ("release_dotlock: error removing lockfile '%s': %s\n",
h->lockname, w32_strerror (-1));
return -1;
}
@ -1261,7 +1261,7 @@ dotlock_release (dotlock_t h)
if ( !h->locked )
{
my_debug_1 ("Oops, `%s' is not locked\n", h->lockname);
my_debug_1 ("Oops, '%s' is not locked\n", h->lockname);
return 0;
}

2
common/dotlock.h
View file

@ -51,7 +51,7 @@
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,

2
common/estream-printf.c
View file

@ -38,7 +38,7 @@
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,

2
common/estream-printf.h
View file

@ -38,7 +38,7 @@
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,

2
common/estream.c
View file

@ -38,7 +38,7 @@
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,

2
common/estream.h
View file

@ -38,7 +38,7 @@
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,

8
common/exechelp-posix.c
View file

@ -253,7 +253,7 @@ do_exec (const char *pgmname, const char *argv[],
{
fds[i] = open ("/dev/null", i? O_WRONLY : O_RDONLY);
if (fds[i] == -1)
log_fatal ("failed to open `%s': %s\n",
log_fatal ("failed to open '%s': %s\n",
"/dev/null", strerror (errno));
}
}
@ -512,13 +512,13 @@ gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *r_exitcode)
}
else if (WIFEXITED (status) && WEXITSTATUS (status) == 127)
{
log_error (_("error running `%s': probably not installed\n"), pgmname);
log_error (_("error running '%s': probably not installed\n"), pgmname);
ec = GPG_ERR_CONFIGURATION;
}
else if (WIFEXITED (status) && WEXITSTATUS (status))
{
if (!r_exitcode)
log_error (_("error running `%s': exit status %d\n"), pgmname,
log_error (_("error running '%s': exit status %d\n"), pgmname,
WEXITSTATUS (status));
else
*r_exitcode = WEXITSTATUS (status);
@ -526,7 +526,7 @@ gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *r_exitcode)
}
else if (!WIFEXITED (status))
{
log_error (_("error running `%s': terminated\n"), pgmname);
log_error (_("error running '%s': terminated\n"), pgmname);
ec = GPG_ERR_GENERAL;
}
else

10
common/exechelp-w32.c
View file

@ -285,7 +285,7 @@ w32_open_null (int for_write)
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, 0, NULL);
if (hfile == INVALID_HANDLE_VALUE)
log_debug ("can't open `nul': %s\n", w32_strerror (-1));
log_debug ("can't open 'nul': %s\n", w32_strerror (-1));
return hfile;
}
@ -494,7 +494,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
| ((flags & 128)? DETACHED_PROCESS : 0)
| GetPriorityClass (GetCurrentProcess ())
| CREATE_SUSPENDED);
/* log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline); */
/* log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline); */
if (!CreateProcess (pgmname, /* Program to start. */
cmdline, /* Command line arguments. */
&sec_attr, /* Process security attributes. */
@ -609,7 +609,7 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
si.hStdOutput = outfd == -1? stdhd[1] : (void*)_get_osfhandle (outfd);
si.hStdError = errfd == -1? stdhd[2] : (void*)_get_osfhandle (errfd);
/* log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline); */
/* log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline); */
if (!CreateProcess (pgmname, /* Program to start. */
cmdline, /* Command line arguments. */
&sec_attr, /* Process security attributes. */
@ -691,7 +691,7 @@ gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *r_exitcode)
}
else if (exc)
{
log_error (_("error running `%s': exit status %d\n"),
log_error (_("error running '%s': exit status %d\n"),
pgmname, (int)exc );
if (r_exitcode)
*r_exitcode = (int)exc;
@ -783,7 +783,7 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
| GetPriorityClass (GetCurrentProcess ())
| CREATE_NEW_PROCESS_GROUP
| DETACHED_PROCESS);
/* log_debug ("CreateProcess(detached), path=`%s' cmdline=`%s'\n", */
/* log_debug ("CreateProcess(detached), path='%s' cmdline='%s'\n", */
/* pgmname, cmdline); */
if (!CreateProcess (pgmname, /* Program to start. */
cmdline, /* Command line arguments. */

8
common/exechelp-w32ce.c
View file

@ -636,7 +636,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
return err;
}
log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline);
log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline);
if (!create_process (pgmname, cmdline, &pi))
{
log_error ("CreateProcess failed: %s\n", w32_strerror (-1));
@ -698,7 +698,7 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
if (err)
return err;
log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline);
log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline);
if (!create_process (pgmname, cmdline, &pi))
{
log_error ("CreateProcess(fd) failed: %s\n", w32_strerror (-1));
@ -762,7 +762,7 @@ gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *exitcode)
}
else if (exc)
{
log_error (_("error running `%s': exit status %d\n"),
log_error (_("error running '%s': exit status %d\n"),
pgmname, (int)exc );
if (exitcode)
*exitcode = (int)exc;
@ -822,7 +822,7 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
return err;
/* Note: There is no detached flag under CE. */
log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline);
log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline);
if (!create_process (pgmname, cmdline, &pi))
{
log_error ("CreateProcess(detached) failed: %s\n", w32_strerror (-1));

2
common/get-passphrase.c
View file

@ -124,7 +124,7 @@ default_inq_cb (void *opaque, const char *line)
/* We do not return errors to avoid breaking other code. */
}
else
log_debug ("ignoring gpg-agent inquiry `%s'\n", line);
log_debug ("ignoring gpg-agent inquiry '%s'\n", line);
return 0;
}

8
common/helpfile.c
View file

@ -54,7 +54,7 @@ findkey_fname (const char *key, const char *fname)
if (errno != ENOENT)
{
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));
}
return NULL;
}
@ -70,7 +70,7 @@ findkey_fname (const char *key, const char *fname)
;
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));
}
else
@ -86,7 +86,7 @@ findkey_fname (const char *key, const char *fname)
continue;
if (*line != '.' || spacep(line+1))
{
log_info (_("file `%s', line %d: %s\n"),
log_info (_("file '%s', line %d: %s\n"),
fname, lnr, _("ignoring garbage line"));
continue;
}
@ -133,7 +133,7 @@ findkey_fname (const char *key, const char *fname)
if ( !err && ferror (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));
}

2
common/homedir.c
View file

@ -237,7 +237,7 @@ w32_rootdir (void)
}
if (!p)
{
log_debug ("bad filename `%s' returned for this process\n", dir);
log_debug ("bad filename '%s' returned for this process\n", dir);
*dir = 0;
}
}

18
common/http.c
View file

@ -1538,7 +1538,7 @@ parse_response (http_t hd)
return GPG_ERR_EOF;
if ((hd->flags & HTTP_FLAG_LOG_RESP))
log_info ("RESP: `%.*s'\n",
log_info ("RESP: '%.*s'\n",
(int)strlen(line)-(*line&&line[1]?2:0),line);
}
while (!*line);
@ -1584,7 +1584,7 @@ parse_response (http_t hd)
if ((*line == '\r' && line[1] == '\n') || *line == '\n')
*line = 0;
if ((hd->flags & HTTP_FLAG_LOG_RESP))
log_info ("RESP: `%.*s'\n",
log_info ("RESP: '%.*s'\n",
(int)strlen(line)-(*line&&line[1]?2:0),line);
if (*line)
{
@ -1834,7 +1834,7 @@ connect_server (const char *server, unsigned short port,
addr.sin_family = host->h_addrtype;
if (addr.sin_family != AF_INET)
{
log_error ("unknown address family for `%s'\n",
log_error ("unknown address family for '%s'\n",
serverlist[srv].target);
xfree (serverlist);
return -1;
@ -1842,7 +1842,7 @@ connect_server (const char *server, unsigned short port,
addr.sin_port = htons (serverlist[srv].port);
if (host->h_length != 4)
{
log_error ("illegal address length for `%s'\n",
log_error ("illegal address length for '%s'\n",
serverlist[srv].target);
xfree (serverlist);
return -1;
@ -1868,12 +1868,12 @@ connect_server (const char *server, unsigned short port,
if (!connected)
{
#ifdef HAVE_W32_SYSTEM
log_error ("can't connect to `%s': %s%sec=%d\n",
log_error ("can't connect to '%s': %s%sec=%d\n",
server,
hostfound? "":_("host not found"),
hostfound? "":" - ", (int)WSAGetLastError());
#else
log_error ("can't connect to `%s': %s\n",
log_error ("can't connect to '%s': %s\n",
server,
hostfound? strerror (last_errno):"host not found");
#endif
@ -2166,7 +2166,7 @@ main (int argc, char **argv)
rc = http_parse_uri (&uri, *argv, 1);
if (rc)
{
log_error ("`%s': %s\n", *argv, gpg_strerror (rc));
log_error ("'%s': %s\n", *argv, gpg_strerror (rc));
return 1;
}
@ -2208,7 +2208,7 @@ main (int argc, char **argv)
rc = http_open_document (&hd, *argv, NULL, 0, NULL, tls_session, NULL, NULL);
if (rc)
{
log_error ("can't get `%s': %s\n", *argv, gpg_strerror (rc));
log_error ("can't get '%s': %s\n", *argv, gpg_strerror (rc));
return 1;
}
log_info ("open_http_document succeeded; status=%u\n",
@ -2223,7 +2223,7 @@ main (int argc, char **argv)
break;
case 301:
case 302:
printf ("Redirected to `%s'\n", http_get_header (hd, "Location"));
printf ("Redirected to '%s'\n", http_get_header (hd, "Location"));
break;
}
http_close (hd, 0);

30
common/iobuf.c
View file

@ -1074,7 +1074,7 @@ print_chain (iobuf_t a)
a->filter (a->filter_ov, IOBUFCTRL_DESC, NULL,
(byte *) & desc, &dummy_len);
log_debug ("iobuf chain: %d.%d `%s' filter_eof=%d start=%d len=%d\n",
log_debug ("iobuf chain: %d.%d '%s' filter_eof=%d start=%d len=%d\n",
a->no, a->subno, desc?desc:"?", a->filter_eof,
(int) a->d.start, (int) a->d.len);
}
@ -1132,7 +1132,7 @@ iobuf_close (iobuf_t a)
log_error ("iobuf_flush failed on close: %s\n", gpg_strerror (rc));
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: close `%s'\n", a->no, a->subno,
log_debug ("iobuf-%d.%d: close '%s'\n", a->no, a->subno,
a->desc?a->desc:"?");
if (a->filter && (rc = a->filter (a->filter_ov, IOBUFCTRL_FREE,
a->chain, NULL, &dummy_len)))
@ -1318,7 +1318,7 @@ iobuf_open (const char *fname)
file_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: open `%s' fd=%d\n",
log_debug ("iobuf-%d.%d: open '%s' fd=%d\n",
a->no, a->subno, fname, FD2INT (fcx->fp));
return a;
@ -1346,7 +1346,7 @@ do_iobuf_fdopen (int fd, const char *mode, int keep_open)
file_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: fdopen%s `%s'\n",
log_debug ("iobuf-%d.%d: fdopen%s '%s'\n",
a->no, a->subno, keep_open? "_nc":"", fcx->fname);
iobuf_ioctl (a, IOBUF_IOCTL_NO_CACHE, 1, NULL);
return a;
@ -1386,7 +1386,7 @@ iobuf_esopen (estream_t estream, const char *mode, int keep_open)
file_es_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
file_es_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: esopen%s `%s'\n",
log_debug ("iobuf-%d.%d: esopen%s '%s'\n",
a->no, a->subno, keep_open? "_nc":"", fcx->fname);
return a;
}
@ -1410,7 +1410,7 @@ iobuf_sockopen (int fd, const char *mode)
sock_filter (scx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
sock_filter (scx, IOBUFCTRL_INIT, NULL, NULL, &len);
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: sockopen `%s'\n", a->no, a->subno, scx->fname);
log_debug ("iobuf-%d.%d: sockopen '%s'\n", a->no, a->subno, scx->fname);
iobuf_ioctl (a, IOBUF_IOCTL_NO_CACHE, 1, NULL);
#else
a = iobuf_fdopen (fd, mode);
@ -1453,7 +1453,7 @@ iobuf_create (const char *fname)
file_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: create `%s'\n", a->no, a->subno,
log_debug ("iobuf-%d.%d: create '%s'\n", a->no, a->subno,
a->desc?a->desc:"?");
return a;
@ -1482,7 +1482,7 @@ iobuf_openrw (const char *fname)
file_filter (fcx, IOBUFCTRL_DESC, NULL, (byte *) & a->desc, &len);
file_filter (fcx, IOBUFCTRL_INIT, NULL, NULL, &len);
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: openrw `%s'\n", a->no, a->subno,
log_debug ("iobuf-%d.%d: openrw '%s'\n", a->no, a->subno,
a->desc?a->desc:"?");
return a;
@ -1498,7 +1498,7 @@ iobuf_ioctl (iobuf_t a, iobuf_ioctl_t cmd, int intval, void *ptrval)
the past by http.c; this ioctl is not directly used
anymore. */
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: ioctl `%s' keep_open=%d\n",
log_debug ("iobuf-%d.%d: ioctl '%s' keep_open=%d\n",
a ? a->no : -1, a ? a->subno : -1,
a && a->desc ? a->desc : "?",
intval);
@ -1521,7 +1521,7 @@ iobuf_ioctl (iobuf_t a, iobuf_ioctl_t cmd, int intval, void *ptrval)
else if (cmd == IOBUF_IOCTL_INVALIDATE_CACHE)
{
if (DBG_IOBUF)
log_debug ("iobuf-*.*: ioctl `%s' invalidate\n",
log_debug ("iobuf-*.*: ioctl '%s' invalidate\n",
ptrval ? (char *) ptrval : "?");
if (!a && !intval && ptrval)
{
@ -1533,7 +1533,7 @@ iobuf_ioctl (iobuf_t a, iobuf_ioctl_t cmd, int intval, void *ptrval)
else if (cmd == IOBUF_IOCTL_NO_CACHE)
{
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: ioctl `%s' no_cache=%d\n",
log_debug ("iobuf-%d.%d: ioctl '%s' no_cache=%d\n",
a ? a->no : -1, a ? a->subno : -1,
a && a->desc? a->desc : "?",
intval);
@ -1558,7 +1558,7 @@ iobuf_ioctl (iobuf_t a, iobuf_ioctl_t cmd, int intval, void *ptrval)
/* Do a fsync on the open fd and return any errors to the caller
of iobuf_ioctl. Note that we work on a file name here. */
if (DBG_IOBUF)
log_debug ("iobuf-*.*: ioctl `%s' fsync\n",
log_debug ("iobuf-*.*: ioctl '%s' fsync\n",
ptrval? (const char*)ptrval:"<null>");
if (!a && !intval && ptrval)
@ -1650,7 +1650,7 @@ iobuf_push_filter2 (iobuf_t a,
if (DBG_IOBUF)
{
log_debug ("iobuf-%d.%d: push `%s'\n", a->no, a->subno,
log_debug ("iobuf-%d.%d: push '%s'\n", a->no, a->subno,
a->desc?a->desc:"?");
print_chain (a);
}
@ -1678,7 +1678,7 @@ pop_filter (iobuf_t a, int (*f) (void *opaque, int control,
BUG ();
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: pop `%s'\n", a->no, a->subno,
log_debug ("iobuf-%d.%d: pop '%s'\n", a->no, a->subno,
a->desc?a->desc:"?");
if (!a->filter)
{ /* this is simple */
@ -1765,7 +1765,7 @@ underflow (iobuf_t a)
{
iobuf_t b = a->chain;
if (DBG_IOBUF)
log_debug ("iobuf-%d.%d: pop `%s' in underflow\n",
log_debug ("iobuf-%d.%d: pop '%s' in underflow\n",
a->no, a->subno, a->desc?a->desc:"?");
xfree (a->d.buf);
xfree (a->real_fname);

4
common/logging.c
View file

@ -339,7 +339,7 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size)
{
if (!cookie->quiet && !running_detached
&& isatty (es_fileno (es_stderr)))
es_fprintf (es_stderr, "can't connect to `%s': %s\n",
es_fprintf (es_stderr, "can't connect to '%s': %s\n",
cookie->name, strerror(errno));
sock_close (cookie->fd);
cookie->fd = -1;
@ -389,7 +389,7 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size)
&& isatty (es_fileno (es_stderr)))
{
if (*cookie->name)
es_fprintf (es_stderr, "error writing to `%s': %s\n",
es_fprintf (es_stderr, "error writing to '%s': %s\n",
cookie->name, strerror(errno));
else
es_fprintf (es_stderr, "error writing to file descriptor %d: %s\n",

2
common/simple-pwquery.c
View file

@ -392,7 +392,7 @@ agent_open (int *rfd)
if (rc == -1)
{
#ifdef SPWQ_USE_LOGGING
log_error ( _("can't connect to `%s': %s\n"), infostr, strerror (errno));
log_error ( _("can't connect to '%s': %s\n"), infostr, strerror (errno));
#endif
close (fd );
return SPWQ_IO_ERROR;

4
common/stringhelp.c
View file

@ -923,8 +923,8 @@ strsep (char **stringp, const char *delim)
return NULL;
/* A frequent case is when the delimiter string contains only one
character. Here we don't need to call the expensive `strpbrk'
function and instead work using `strchr'. */
character. Here we don't need to call the expensive 'strpbrk'
function and instead work using 'strchr'. */
if (delim[0] == '\0' || delim[1] == '\0')
{
char ch = delim[0];

4
common/t-b64.c
View file

@ -77,7 +77,7 @@ test_b64enc_file (const char *fname)
fp = fname ? fopen (fname, "r") : stdin;
if (!fp)
{
fprintf (stderr, "%s:%d: can't open `%s': %s\n",
fprintf (stderr, "%s:%d: can't open '%s': %s\n",
__FILE__, __LINE__, fname? fname:"[stdin]", strerror (errno));
fail (0);
}
@ -113,7 +113,7 @@ test_b64dec_file (const char *fname)
fp = fname ? fopen (fname, "r") : stdin;
if (!fp)
{
fprintf (stderr, "%s:%d: can't open `%s': %s\n",
fprintf (stderr, "%s:%d: can't open '%s': %s\n",
__FILE__, __LINE__, fname? fname:"[stdin]", strerror (errno));
fail (0);
}

2
common/t-dns-cert.c
View file

@ -52,7 +52,7 @@ main (int argc, char **argv)
return 1;
}
printf ("CERT lookup on `%s'\n", name);
printf ("CERT lookup on '%s'\n", name);
err = get_dns_cert (name, &key, &fpr, &fpr_len, &url);
if (err)

2
common/t-dotlock.c
View file

@ -92,7 +92,7 @@ lock_and_unlock (const char *fname)
h = dotlock_create (fname, 0);
if (!h)
die ("error creating lock file for `%s': %s", fname, strerror (errno));
die ("error creating lock file for '%s': %s", fname, strerror (errno));
inf ("lock created");
while (!ctrl_c_pending)

10
common/t-gettime.c
View file

@ -67,7 +67,7 @@ test_isotime2epoch (void)
{
fail (idx);
if (verbose)
fprintf (stderr, "string `%s' exp: %ld got: %ld\n",
fprintf (stderr, "string '%s' exp: %ld got: %ld\n",
array[idx].string, (long)array[idx].expected,
(long)val);
}
@ -77,7 +77,7 @@ test_isotime2epoch (void)
if (strlen (tbuf) != 15)
{
if (verbose)
fprintf (stderr, "string `%s', time-t %ld, revert: `%s'\n",
fprintf (stderr, "string '%s', time-t %ld, revert: '%s'\n",
array[idx].string, (long)val, tbuf);
fail (idx);
}
@ -153,21 +153,21 @@ test_string2isotime (void)
{
fail (idx);
if (verbose)
fprintf (stderr, "string `%s' expected: %d, got: %d\n",
fprintf (stderr, "string '%s' expected: %d, got: %d\n",
array[idx].string, (int)array[idx].result, (int)result);
}
else if (result && strlen (tbuf) != 15)
{
fail (idx);
if (verbose)
fprintf (stderr, "string `%s' invalid isotime returned\n",
fprintf (stderr, "string '%s' invalid isotime returned\n",
array[idx].string);
}
else if (result && strcmp (array[idx].expected, tbuf))
{
fail (idx);
if (verbose)
fprintf (stderr, "string `%s' bad isotime '%s' returned\n",
fprintf (stderr, "string '%s' bad isotime '%s' returned\n",
array[idx].string, tbuf);
}
}

4
common/t-helpfile.c
View file

@ -53,12 +53,12 @@ main (int argc, char **argv)
if (!result)
{
fprintf (stderr,
"Error: nothing found for `%s'\n", argc?argv[0]:"(null)");
"Error: nothing found for '%s'\n", argc?argv[0]:"(null)");
errcount++;
}
else
{
printf ("key `%s' result=`%s'\n", argc?argv[0]:"(null)", result);
printf ("key '%s' result='%s'\n", argc?argv[0]:"(null)", result);
xfree (result);
}

6
common/t-ssh-utils.c
View file

@ -120,14 +120,14 @@ read_file (const char *fname, size_t *r_length)
fp = fopen (fname, "rb");
if (!fp)
{
fprintf (stderr, "%s:%d: can't open `%s': %s\n",
fprintf (stderr, "%s:%d: can't open '%s': %s\n",
__FILE__, __LINE__, fname, strerror (errno));
exit (1);
}
if (fstat (fileno(fp), &st))
{
fprintf (stderr, "%s:%d: can't stat `%s': %s\n",
fprintf (stderr, "%s:%d: can't stat '%s': %s\n",
__FILE__, __LINE__, fname, strerror (errno));
exit (1);
}
@ -136,7 +136,7 @@ read_file (const char *fname, size_t *r_length)
buf = xmalloc (buflen+1);
if (fread (buf, buflen, 1, fp) != 1)
{
fprintf (stderr, "%s:%d: error reading `%s': %s\n",
fprintf (stderr, "%s:%d: error reading '%s': %s\n",
__FILE__, __LINE__, fname, strerror (errno));
exit (1);
}

2
common/ttyio.c
View file

@ -189,7 +189,7 @@ init_ttyfp(void)
#else
ttyfp = batchmode? stderr : fopen (tty_get_ttyname (), "r+");
if( !ttyfp ) {
log_error("cannot open `%s': %s\n", tty_get_ttyname (),
log_error("cannot open '%s': %s\n", tty_get_ttyname (),
strerror(errno) );
exit(2);
}

8
common/utf8conv.c
View file

@ -97,7 +97,7 @@ load_libiconv (void)
}
if (!handle || !iconv_close)
{
log_info (_("error loading `%s': %s\n"),
log_info (_("error loading '%s': %s\n"),
"iconv.dll", dlerror ());
log_info (_("please see %s for more information\n"),
"http://www.gnupg.org/download/iconv.html");
@ -136,7 +136,7 @@ handle_iconv_error (const char *to, const char *from, int use_fallback)
}
if (!x)
log_info (_("conversion from `%s' to `%s' not available\n"),
log_info (_("conversion from '%s' to '%s' not available\n"),
from, to);
}
else
@ -403,7 +403,7 @@ native_to_utf8 (const char *orig_string)
static int shown;
if (!shown)
log_info (_("conversion from `%s' to `%s' failed: %s\n"),
log_info (_("conversion from '%s' to '%s' failed: %s\n"),
active_charset_name, "utf-8", strerror (errno));
shown = 1;
/* We don't do any conversion at all but use the strings as is. */
@ -669,7 +669,7 @@ do_utf8_to_native (const char *string, size_t length, int delim,
static int shown;
if (!shown)
log_info (_("conversion from `%s' to `%s' failed: %s\n"),
log_info (_("conversion from '%s' to '%s' failed: %s\n"),
"utf-8", active_charset_name, strerror (errno));
shown = 1;
/* Didn't worked out. Try again but without iconv. */