aboutsummaryrefslogtreecommitdiffstats
path: root/tools/gpgtar-extract.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2012-06-05 17:29:22 +0000
committerWerner Koch <[email protected]>2012-06-05 17:29:22 +0000
commit096e7457ec636bcfcf128678660eb2f2e19f113a (patch)
treeb54df55112f195895d6d952ce3cfb3f4c98e7683 /tools/gpgtar-extract.c
parentPrint the hash algorithm in colon mode key listing. (diff)
downloadgnupg-096e7457ec636bcfcf128678660eb2f2e19f113a.tar.gz
gnupg-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 '')
-rw-r--r--tools/gpgtar-extract.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index bd5b3a432..d0e462083 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -56,7 +56,7 @@ extract_regular (estream_t stream, const char *dirname,
if (!outfp)
{
err = gpg_error_from_syserror ();
- log_error ("error creating `%s': %s\n", fname, gpg_strerror (err));
+ log_error ("error creating '%s': %s\n", fname, gpg_strerror (err));
goto leave;
}
@@ -71,7 +71,7 @@ extract_regular (estream_t stream, const char *dirname,
if (nwritten != nbytes)
{
err = gpg_error_from_syserror ();
- log_error ("error writing `%s': %s\n", fname, gpg_strerror (err));
+ log_error ("error writing '%s': %s\n", fname, gpg_strerror (err));
goto leave;
}
}
@@ -79,12 +79,12 @@ extract_regular (estream_t stream, const char *dirname,
leave:
if (!err && opt.verbose)
- log_info ("extracted `%s'\n", fname);
+ log_info ("extracted '%s'\n", fname);
es_fclose (outfp);
if (err && fname && outfp)
{
if (gnupg_remove (fname))
- log_error ("error removing incomplete file `%s': %s\n",
+ log_error ("error removing incomplete file '%s': %s\n",
fname, gpg_strerror (gpg_error_from_syserror ()));
}
xfree (fname);
@@ -137,13 +137,13 @@ extract_directory (const char *dirname, tar_header_t hdr)
err = 0;
}
if (err)
- log_error ("error creating directory `%s': %s\n",
+ log_error ("error creating directory '%s': %s\n",
fname, gpg_strerror (err));
}
leave:
if (!err && opt.verbose)
- log_info ("created `%s/'\n", fname);
+ log_info ("created '%s/'\n", fname);
xfree (fname);
return err;
}
@@ -159,7 +159,7 @@ extract (estream_t stream, const char *dirname, tar_header_t hdr)
#ifdef HAVE_DOSISH_SYSTEM
if (strchr (hdr->name, '\\'))
{
- log_error ("filename `%s' contains a backslash - "
+ log_error ("filename '%s' contains a backslash - "
"can't extract on this system\n", hdr->name);
return gpg_error (GPG_ERR_INV_NAME);
}
@@ -171,7 +171,7 @@ extract (estream_t stream, const char *dirname, tar_header_t hdr)
|| !strncmp (hdr->name, "../", 3)
|| (n >= 3 && !strcmp (hdr->name+n-3, "/.." )))
{
- log_error ("filename `%s' as suspicious parts - not extracting\n",
+ log_error ("filename '%s' as suspicious parts - not extracting\n",
hdr->name);
return gpg_error (GPG_ERR_INV_NAME);
}
@@ -184,7 +184,7 @@ extract (estream_t stream, const char *dirname, tar_header_t hdr)
{
char record[RECORDSIZE];
- log_info ("unsupported file type %d for `%s' - skipped\n",
+ log_info ("unsupported file type %d for '%s' - skipped\n",
(int)hdr->typeflag, hdr->name);
for (err = 0, n=0; !err && n < hdr->nrecords; n++)
err = read_record (stream, record);
@@ -278,7 +278,7 @@ gpgtar_extract (const char *filename)
if (!stream)
{
err = gpg_error_from_syserror ();
- log_error ("error opening `%s': %s\n", filename, gpg_strerror (err));
+ log_error ("error opening '%s': %s\n", filename, gpg_strerror (err));
return;
}
}
@@ -316,7 +316,7 @@ gpgtar_extract (const char *filename)
}
if (opt.verbose)
- log_info ("extracting to `%s/'\n", dirname);
+ log_info ("extracting to '%s/'\n", dirname);
for (;;)
{