diff options
author | Werner Koch <wk@gnupg.org> | 2012-06-05 19:29:22 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2012-06-05 19:29:22 +0200 |
commit | 096e7457ec636bcfcf128678660eb2f2e19f113a (patch) | |
tree | b54df55112f195895d6d952ce3cfb3f4c98e7683 /sm | |
parent | Print the hash algorithm in colon mode key listing. (diff) | |
download | gnupg2-096e7457ec636bcfcf128678660eb2f2e19f113a.tar.xz gnupg2-096e7457ec636bcfcf128678660eb2f2e19f113a.zip |
Change all quotes in strings and comments to the new GNU standard.
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.
Diffstat (limited to 'sm')
-rw-r--r-- | sm/call-agent.c | 2 | ||||
-rw-r--r-- | sm/call-dirmngr.c | 4 | ||||
-rw-r--r-- | sm/certchain.c | 2 | ||||
-rw-r--r-- | sm/certcheck.c | 2 | ||||
-rw-r--r-- | sm/certdump.c | 2 | ||||
-rw-r--r-- | sm/certreqgen-ui.c | 4 | ||||
-rw-r--r-- | sm/certreqgen.c | 16 | ||||
-rw-r--r-- | sm/decrypt.c | 4 | ||||
-rw-r--r-- | sm/delete.c | 8 | ||||
-rw-r--r-- | sm/encrypt.c | 6 | ||||
-rw-r--r-- | sm/export.c | 8 | ||||
-rw-r--r-- | sm/gpgsm.c | 28 | ||||
-rw-r--r-- | sm/keydb.c | 16 | ||||
-rw-r--r-- | sm/keylist.c | 2 | ||||
-rw-r--r-- | sm/minip12.c | 12 | ||||
-rw-r--r-- | sm/qualified.c | 6 | ||||
-rw-r--r-- | sm/sign.c | 2 | ||||
-rw-r--r-- | sm/verify.c | 4 |
18 files changed, 64 insertions, 64 deletions
diff --git a/sm/call-agent.c b/sm/call-agent.c index 9619b856f..acf6c04ad 100644 --- a/sm/call-agent.c +++ b/sm/call-agent.c @@ -147,7 +147,7 @@ default_inq_cb (void *opaque, const char *line) /* We do not pass errors to avoid breaking other code. */ } else - log_error ("ignoring gpg-agent inquiry `%s'\n", line); + log_error ("ignoring gpg-agent inquiry '%s'\n", line); return 0; } diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index 92f7a0e2c..b7417a368 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -340,7 +340,7 @@ inq_certificate (void *opaque, const char *line) } else { - log_error ("unsupported inquiry `%s'\n", line); + log_error ("unsupported inquiry '%s'\n", line); return gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE); } @@ -914,7 +914,7 @@ run_command_inq_cb (void *opaque, const char *line) } 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/sm/certchain.c b/sm/certchain.c index 54c7a5772..18744b13a 100644 --- a/sm/certchain.c +++ b/sm/certchain.c @@ -342,7 +342,7 @@ check_cert_policy (ksba_cert_t cert, int listmode, estream_t fplist) if (!fp) { if (opt.verbose || errno != ENOENT) - log_info (_("failed to open `%s': %s\n"), + log_info (_("failed to open '%s': %s\n"), opt.policy_file, strerror (errno)); xfree (policies); /* With no critical policies this is only a warning */ diff --git a/sm/certcheck.c b/sm/certcheck.c index f36873ddf..904556f5c 100644 --- a/sm/certcheck.c +++ b/sm/certcheck.c @@ -237,7 +237,7 @@ gpgsm_check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert) algo = gcry_md_map_name ( (algoid=ksba_cert_get_digest_algo (cert))); if (!algo) { - log_error ("unknown hash algorithm `%s'\n", algoid? algoid:"?"); + log_error ("unknown hash algorithm '%s'\n", algoid? algoid:"?"); if (algoid && ( !strcmp (algoid, "1.2.840.113549.1.1.2") ||!strcmp (algoid, "1.2.840.113549.2.2"))) diff --git a/sm/certdump.c b/sm/certdump.c index 9d9feb07d..21a5e292c 100644 --- a/sm/certdump.c +++ b/sm/certdump.c @@ -183,7 +183,7 @@ gpgsm_dump_cert (const char *text, ksba_cert_t cert) char *dn; ksba_isotime_t t; - log_debug ("BEGIN Certificate `%s':\n", text? text:""); + log_debug ("BEGIN Certificate '%s':\n", text? text:""); if (cert) { sexp = ksba_cert_get_serial (cert); diff --git a/sm/certreqgen-ui.c b/sm/certreqgen-ui.c index 41492f5b0..1035404cd 100644 --- a/sm/certreqgen-ui.c +++ b/sm/certreqgen-ui.c @@ -309,7 +309,7 @@ gpgsm_gencertreq_tty (ctrl_t ctrl, estream_t output_stream) else if ( (err = ksba_dn_teststr (answer, 0, &erroff, &errlen)) ) { if (gpg_err_code (err) == GPG_ERR_UNKNOWN_NAME) - tty_printf (_("Invalid subject name label `%.*s'\n"), + tty_printf (_("Invalid subject name label '%.*s'\n"), (int)errlen, answer+erroff); else { @@ -318,7 +318,7 @@ gpgsm_gencertreq_tty (ctrl_t ctrl, estream_t output_stream) adjust it do the length of your translation. The second string is merely passed to atoi so you can drop everything after the number. */ - tty_printf (_("Invalid subject name `%s'\n"), answer); + tty_printf (_("Invalid subject name '%s'\n"), answer); tty_printf ("%*s^\n", atoi (_("22 translator: see " "certreg-ui.c:gpgsm_gencertreq_tty")) diff --git a/sm/certreqgen.c b/sm/certreqgen.c index de7c39c65..241e67df4 100644 --- a/sm/certreqgen.c +++ b/sm/certreqgen.c @@ -305,7 +305,7 @@ read_parameters (ctrl_t ctrl, estream_t fp, estream_t out_fp) para = NULL; } else - log_info ("skipping control `%s' (%s)\n", keyword, value); + log_info ("skipping control '%s' (%s)\n", keyword, value); continue; } @@ -502,10 +502,10 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para, { r = get_parameter (para, pNAMEDN, 0); if (gpg_err_code (err) == GPG_ERR_UNKNOWN_NAME) - log_error (_("line %d: invalid subject name label `%.*s'\n"), + log_error (_("line %d: invalid subject name label '%.*s'\n"), r->lnr, (int)errlen, s+erroff); else - log_error (_("line %d: invalid subject name `%s' at pos %d\n"), + log_error (_("line %d: invalid subject name '%s' at pos %d\n"), r->lnr, s, (int)erroff); xfree (cardkeyid); @@ -557,10 +557,10 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para, { r = get_parameter (para, pISSUERDN, 0); if (gpg_err_code (err) == GPG_ERR_UNKNOWN_NAME) - log_error (_("line %d: invalid issuer name label `%.*s'\n"), + log_error (_("line %d: invalid issuer name label '%.*s'\n"), r->lnr, (int)errlen, string+erroff); else - log_error (_("line %d: invalid issuer name `%s' at pos %d\n"), + log_error (_("line %d: invalid issuer name '%s' at pos %d\n"), r->lnr, string, (int)erroff); xfree (cardkeyid); return gpg_error (GPG_ERR_INV_PARAMETER); @@ -596,7 +596,7 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para, if (rc) { r = get_parameter (para, pKEYTYPE, 0); - log_error (_("line %d: error getting signing key by keygrip `%s'" + log_error (_("line %d: error getting signing key by keygrip '%s'" ": %s\n"), r->lnr, s, gpg_strerror (rc)); xfree (cardkeyid); return rc; @@ -696,7 +696,7 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para, if (rc) { r = get_parameter (para, pKEYTYPE, 0); - log_error (_("line %d: error reading key `%s' from card: %s\n"), + log_error (_("line %d: error reading key '%s' from card: %s\n"), r->lnr, cardkeyid, gpg_strerror (rc)); xfree (sigkey); xfree (cardkeyid); @@ -709,7 +709,7 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para, if (rc) { r = get_parameter (para, pKEYTYPE, 0); - log_error (_("line %d: error getting key by keygrip `%s': %s\n"), + log_error (_("line %d: error getting key by keygrip '%s': %s\n"), r->lnr, s, gpg_strerror (rc)); xfree (sigkey); xfree (cardkeyid); diff --git a/sm/decrypt.c b/sm/decrypt.c index da833e106..616115070 100644 --- a/sm/decrypt.c +++ b/sm/decrypt.c @@ -325,7 +325,7 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp) if (!algo || !mode) { rc = gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM); - log_error ("unsupported algorithm `%s'\n", algoid? algoid:"?"); + log_error ("unsupported algorithm '%s'\n", algoid? algoid:"?"); if (algoid && !strcmp (algoid, "1.2.840.113549.3.2")) log_info (_("(this is the RC2 algorithm)\n")); else if (!algoid) @@ -386,7 +386,7 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp) { ksba_cert_t cert = NULL; - log_debug ("recp %d - issuer: `%s'\n", + log_debug ("recp %d - issuer: '%s'\n", recp, issuer? issuer:"[NONE]"); log_debug ("recp %d - serial: ", recp); gpgsm_dump_serial (serial); diff --git a/sm/delete.c b/sm/delete.c index 97fadfa30..bafe60122 100644 --- a/sm/delete.c +++ b/sm/delete.c @@ -48,7 +48,7 @@ delete_one (ctrl_t ctrl, const char *username) rc = classify_user_id (username, &desc, 0); if (rc) { - log_error (_("certificate `%s' not found: %s\n"), + log_error (_("certificate '%s' not found: %s\n"), username, gpg_strerror (rc)); gpgsm_status2 (ctrl, STATUS_DELETE_PROBLEM, "1", NULL); goto leave; @@ -109,7 +109,7 @@ delete_one (ctrl_t ctrl, const char *username) { if (rc == -1) rc = gpg_error (GPG_ERR_NO_PUBKEY); - log_error (_("certificate `%s' not found: %s\n"), + log_error (_("certificate '%s' not found: %s\n"), username, gpg_strerror (rc)); gpgsm_status2 (ctrl, STATUS_DELETE_PROBLEM, "3", NULL); goto leave; @@ -140,9 +140,9 @@ delete_one (ctrl_t ctrl, const char *username) if (opt.verbose) { if (duplicates) - log_info (_("duplicated certificate `%s' deleted\n"), username); + log_info (_("duplicated certificate '%s' deleted\n"), username); else - log_info (_("certificate `%s' deleted\n"), username); + log_info (_("certificate '%s' deleted\n"), username); } } while (duplicates--); diff --git a/sm/encrypt.c b/sm/encrypt.c index e66fac7f6..e881333c0 100644 --- a/sm/encrypt.c +++ b/sm/encrypt.c @@ -74,7 +74,7 @@ init_dek (DEK dek) mode = gcry_cipher_mode_from_oid (dek->algoid); if (!dek->algo || !mode) { - log_error ("unsupported algorithm `%s'\n", dek->algoid); + log_error ("unsupported algorithm '%s'\n", dek->algoid); return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM); } @@ -85,7 +85,7 @@ init_dek (DEK dek) { case GCRY_CIPHER_DES: case GCRY_CIPHER_RFC2268_40: - log_error ("cipher algorithm `%s' not allowed: too weak\n", + log_error ("cipher algorithm '%s' not allowed: too weak\n", gnupg_cipher_algo_name (dek->algo)); return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM); default: @@ -103,7 +103,7 @@ init_dek (DEK dek) /* Make sure we don't use weak keys. */ if (dek->keylen < 100/8) { - log_error ("key length of `%s' too small\n", dek->algoid); + log_error ("key length of '%s' too small\n", dek->algoid); return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM); } diff --git a/sm/export.c b/sm/export.c index 2e4fed9a1..0403fe2f5 100644 --- a/sm/export.c +++ b/sm/export.c @@ -181,7 +181,7 @@ gpgsm_export (ctrl_t ctrl, strlist_t names, estream_t stream) rc = classify_user_id (sl->d, desc+ndesc, 0); if (rc) { - log_error ("key `%s' not found: %s\n", + log_error ("key '%s' not found: %s\n", sl->d, gpg_strerror (rc)); rc = 0; } @@ -351,7 +351,7 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, estream_t stream) err = classify_user_id (name, desc, 0); if (err) { - log_error ("key `%s' not found: %s\n", + log_error ("key '%s' not found: %s\n", name, gpg_strerror (err)); goto leave; } @@ -388,7 +388,7 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, estream_t stream) err = 0; if (err) { - log_error ("key `%s' not found: %s\n", + log_error ("key '%s' not found: %s\n", name, gpg_strerror (err)); goto leave; } @@ -399,7 +399,7 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, estream_t stream) { /* Note, that the !keygrip case indicates a bad certificate. */ err = gpg_error (GPG_ERR_NO_SECKEY); - log_error ("can't export key `%s': %s\n", name, gpg_strerror (err)); + log_error ("can't export key '%s': %s\n", name, gpg_strerror (err)); goto leave; } diff --git a/sm/gpgsm.c b/sm/gpgsm.c index d8ddbee53..7263fd090 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -678,7 +678,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); gpgsm_exit (2); } @@ -743,12 +743,12 @@ do_add_recipient (ctrl_t ctrl, const char *name, { if (recp_required) { - log_error ("can't encrypt to `%s': %s\n", name, gpg_strerror (rc)); + log_error ("can't encrypt to '%s': %s\n", name, gpg_strerror (rc)); gpgsm_status2 (ctrl, STATUS_INV_RECP, get_inv_recpsgnr_code (rc), name, NULL); } else - log_info (_("NOTE: won't be able to encrypt to `%s': %s\n"), + log_info (_("NOTE: won't be able to encrypt to '%s': %s\n"), name, gpg_strerror (rc)); } } @@ -759,7 +759,7 @@ parse_validation_model (const char *model) { int i = gpgsm_parse_validation_model (model); if (i == -1) - log_error (_("unknown validation model `%s'\n"), model); + log_error (_("unknown validation model '%s'\n"), model); else default_validation_model = i; } @@ -1017,18 +1017,18 @@ main ( int argc, char **argv) if (default_config) { if (parse_debug) - log_info (_("NOTE: no default option file `%s'\n"), configname); + log_info (_("NOTE: no default option file '%s'\n"), configname); } else { - log_error (_("option file `%s': %s\n"), configname, strerror(errno)); + log_error (_("option file '%s': %s\n"), configname, strerror(errno)); gpgsm_exit(2); } xfree(configname); 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; } @@ -1480,7 +1480,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]); } /*FIXME if (opt.batch) */ @@ -1577,7 +1577,7 @@ main ( int argc, char **argv) filelist[1] = NULL; if (!access (filelist[0], F_OK)) { - log_info (_("importing common certificates `%s'\n"), + log_info (_("importing common certificates '%s'\n"), filelist[0]); gpgsm_import_files (&ctrl, 1, filelist, open_read); } @@ -1618,7 +1618,7 @@ main ( int argc, char **argv) int rc = gpgsm_add_to_certlist (&ctrl, sl->d, 1, &signerlist, 0); if (rc) { - log_error (_("can't sign using `%s': %s\n"), + log_error (_("can't sign using '%s': %s\n"), sl->d, gpg_strerror (rc)); gpgsm_status2 (&ctrl, STATUS_INV_SGNR, get_inv_recpsgnr_code (rc), sl->d, NULL); @@ -2062,7 +2062,7 @@ open_read (const char *filename) fd = open (filename, O_RDONLY | O_BINARY); if (fd == -1) { - log_error (_("can't open `%s': %s\n"), filename, strerror (errno)); + log_error (_("can't open '%s': %s\n"), filename, strerror (errno)); gpgsm_exit (2); } return fd; @@ -2092,7 +2092,7 @@ open_es_fread (const char *filename, const char *mode) fp = es_fopen (filename, mode); if (!fp) { - log_error (_("can't open `%s': %s\n"), filename, strerror (errno)); + log_error (_("can't open '%s': %s\n"), filename, strerror (errno)); gpgsm_exit (2); } return fp; @@ -2130,7 +2130,7 @@ open_es_fwrite (const char *filename) fp = es_fopen (filename, "wb"); if (!fp) { - log_error (_("can't open `%s': %s\n"), filename, strerror (errno)); + log_error (_("can't open '%s': %s\n"), filename, strerror (errno)); gpgsm_exit (2); } return fp; @@ -2158,7 +2158,7 @@ run_protect_tool (int argc, char **argv) av[i] = *argv; av[i] = NULL; execv (pgm, av); - log_error ("error executing `%s': %s\n", pgm, strerror (errno)); + log_error ("error executing '%s': %s\n", pgm, strerror (errno)); #endif /*HAVE_W32_SYSTEM*/ gpgsm_exit (2); } diff --git a/sm/keydb.c b/sm/keydb.c index 86301b337..6912b42c6 100644 --- a/sm/keydb.c +++ b/sm/keydb.c @@ -100,7 +100,7 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created) #if !defined(HAVE_DRIVE_LETTERS) && !defined(__riscos__) else if (strchr (resname, ':')) { - log_error ("invalid key resource URL `%s'\n", url ); + log_error ("invalid key resource URL '%s'\n", url ); rc = gpg_error (GPG_ERR_GENERAL); goto leave; } @@ -147,7 +147,7 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created) switch (rt) { case KEYDB_RESOURCE_TYPE_NONE: - log_error ("unknown type of key resource `%s'\n", url ); + log_error ("unknown type of key resource '%s'\n", url ); rc = gpg_error (GPG_ERR_GENERAL); goto leave; @@ -184,7 +184,7 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created) if (!fp) { rc = gpg_error (gpg_err_code_from_errno (errno)); - log_error (_("error creating keybox `%s': %s\n"), + log_error (_("error creating keybox '%s': %s\n"), filename, strerror(errno)); if (errno == ENOENT) log_info (_("you may want to start the gpg-agent first\n")); @@ -192,7 +192,7 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created) } if (!opt.quiet) - log_info (_("keybox `%s' created\n"), filename); + log_info (_("keybox '%s' created\n"), filename); if (auto_created) *auto_created = 1; } @@ -216,7 +216,7 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created) all_resources[used_resources].lockhandle = dotlock_create (filename, 0); if (!all_resources[used_resources].lockhandle) - log_fatal ( _("can't create lock for `%s'\n"), filename); + log_fatal ( _("can't create lock for '%s'\n"), filename); /* Do a compress run if needed and the file is not locked. */ if (!dotlock_take (all_resources[used_resources].lockhandle, 0)) @@ -238,7 +238,7 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created) break; default: - log_error ("resource type of `%s' not supported\n", url); + log_error ("resource type of '%s' not supported\n", url); rc = gpg_error (GPG_ERR_NOT_SUPPORTED); goto leave; } @@ -247,7 +247,7 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created) leave: if (rc) - log_error ("keyblock resource `%s': %s\n", filename, gpg_strerror(rc)); + log_error ("keyblock resource '%s': %s\n", filename, gpg_strerror(rc)); else if (secret) any_secret = 1; else @@ -1206,7 +1206,7 @@ keydb_clear_some_cert_flags (ctrl_t ctrl, strlist_t names) rc = classify_user_id (sl->d, desc+ndesc, 0); if (rc) { - log_error ("key `%s' not found: %s\n", + log_error ("key '%s' not found: %s\n", sl->d, gpg_strerror (rc)); rc = 0; } diff --git a/sm/keylist.c b/sm/keylist.c index 42c533a6d..f96c03f07 100644 --- a/sm/keylist.c +++ b/sm/keylist.c @@ -1359,7 +1359,7 @@ list_internal_keys (ctrl_t ctrl, strlist_t names, estream_t fp, rc = classify_user_id (sl->d, desc+ndesc, 0); if (rc) { - log_error ("key `%s' not found: %s\n", + log_error ("key '%s' not found: %s\n", sl->d, gpg_strerror (rc)); rc = 0; } diff --git a/sm/minip12.c b/sm/minip12.c index 7b53a814e..c91ef226a 100644 --- a/sm/minip12.c +++ b/sm/minip12.c @@ -617,7 +617,7 @@ decrypt_block (const void *ciphertext, unsigned char *plaintext, size_t length, } *outptr = 0; jnlib_iconv_close (cd); - log_info ("decryption failed; trying charset `%s'\n", + log_info ("decryption failed; trying charset '%s'\n", charsets[charsetidx]); } memcpy (plaintext, ciphertext, length); @@ -2401,7 +2401,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen, if (cd == (jnlib_iconv_t)(-1)) { log_error ("can't convert passphrase to" - " requested charset `%s': %s\n", + " requested charset '%s': %s\n", charset, strerror (errno)); gcry_free (pwbuf); goto failure; @@ -2415,7 +2415,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen, &outptr, &outbytes) == (size_t)-1) { log_error ("error converting passphrase to" - " requested charset `%s': %s\n", + " requested charset '%s': %s\n", charset, strerror (errno)); gcry_free (pwbuf); jnlib_iconv_close (cd); @@ -2532,13 +2532,13 @@ main (int argc, char **argv) fp = fopen (argv[1], "rb"); if (!fp) { - fprintf (stderr, "can't open `%s': %s\n", argv[1], strerror (errno)); + fprintf (stderr, "can't open '%s': %s\n", argv[1], strerror (errno)); return 1; } if (fstat (fileno(fp), &st)) { - fprintf (stderr, "can't stat `%s': %s\n", argv[1], strerror (errno)); + fprintf (stderr, "can't stat '%s': %s\n", argv[1], strerror (errno)); return 1; } @@ -2546,7 +2546,7 @@ main (int argc, char **argv) buf = gcry_malloc (buflen+1); if (!buf || fread (buf, buflen, 1, fp) != 1) { - fprintf (stderr, "error reading `%s': %s\n", argv[1], strerror (errno)); + fprintf (stderr, "error reading '%s': %s\n", argv[1], strerror (errno)); return 1; } fclose (fp); diff --git a/sm/qualified.c b/sm/qualified.c index b24b65eaf..56f537ea3 100644 --- a/sm/qualified.c +++ b/sm/qualified.c @@ -63,7 +63,7 @@ read_list (char *key, char *country, int *lnr) if (!listfp && errno != ENOENT) { err = gpg_error_from_syserror (); - log_error (_("can't open `%s': %s\n"), listname, gpg_strerror (err)); + log_error (_("can't open '%s': %s\n"), listname, gpg_strerror (err)); return err; } } @@ -102,7 +102,7 @@ read_list (char *key, char *country, int *lnr) key[j] = 0; if (j != 40 || !(spacep (p+i) || p[i] == '\n')) { - log_error (_("invalid formatted fingerprint in `%s', line %d\n"), + log_error (_("invalid formatted fingerprint in '%s', line %d\n"), listname, *lnr); return gpg_error (GPG_ERR_BAD_DATA); } @@ -120,7 +120,7 @@ read_list (char *key, char *country, int *lnr) } else { - log_error (_("invalid country code in `%s', line %d\n"), listname, *lnr); + log_error (_("invalid country code in '%s', line %d\n"), listname, *lnr); return gpg_error (GPG_ERR_BAD_DATA); } @@ -547,7 +547,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist, algo = gcry_md_map_name (algoid); if (!algo) { - log_error ("unknown hash algorithm `%s'\n", algoid? algoid:"?"); + log_error ("unknown hash algorithm '%s'\n", algoid? algoid:"?"); rc = gpg_error (GPG_ERR_BUG); goto leave; } diff --git a/sm/verify.c b/sm/verify.c index 1173f66d1..8cf7ff9ec 100644 --- a/sm/verify.c +++ b/sm/verify.c @@ -194,7 +194,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp) algo = gcry_md_map_name (algoid); if (!algo) { - log_error ("unknown hash algorithm `%s'\n", + log_error ("unknown hash algorithm '%s'\n", algoid? algoid:"?"); if (algoid && ( !strcmp (algoid, "1.2.840.113549.1.1.2") @@ -308,7 +308,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp) if (DBG_X509) { - log_debug ("signer %d - issuer: `%s'\n", + log_debug ("signer %d - issuer: '%s'\n", signer, issuer? issuer:"[NONE]"); log_debug ("signer %d - serial: ", signer); gpgsm_dump_serial (serial); |