aboutsummaryrefslogtreecommitdiff
path: root/src/gpg.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2009-02-23 10:03:37 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2009-02-23 10:03:37 +0200
commit337a06f32fb530e0e0884fef2f5f630cca9911a1 (patch)
treed0687ccd3e9ff527d9c5613fd052cbe0f79bb40a /src/gpg.c
parent7543ff5973d1afe75b0f4226a3a02cc8d375ad3e (diff)
downloadwydawca-337a06f32fb530e0e0884fef2f5f630cca9911a1.tar.gz
wydawca-337a06f32fb530e0e0884fef2f5f630cca9911a1.tar.bz2
Add missing i18n markers
Diffstat (limited to 'src/gpg.c')
-rw-r--r--src/gpg.c52
1 files changed, 27 insertions, 25 deletions
diff --git a/src/gpg.c b/src/gpg.c
index 453a908..d6e2301 100644
--- a/src/gpg.c
+++ b/src/gpg.c
@@ -26,7 +26,8 @@
26 int a = expr; \ 26 int a = expr; \
27 if (a) \ 27 if (a) \
28 { \ 28 { \
29 logmsg (LOG_ERR, "%s: GPGME error: %s", #expr, gpgme_strerror (a)); \ 29 logmsg (LOG_ERR, _("%s: GPGME error: %s"), #expr, \
30 gpgme_strerror (a)); \
30 return 1; \ 31 return 1; \
31 } \ 32 } \
32 } \ 33 } \
@@ -47,7 +48,7 @@ recursive_rmdir (const char *name)
47 48
48 if (chdir (name)) 49 if (chdir (name))
49 { 50 {
50 logmsg (LOG_ERR, "cannot change to directory %s: %s", 51 logmsg (LOG_ERR, _("cannot change to directory %s: %s"),
51 name, strerror (errno)); 52 name, strerror (errno));
52 return 1; 53 return 1;
53 } 54 }
@@ -55,7 +56,7 @@ recursive_rmdir (const char *name)
55 dir = opendir ("."); 56 dir = opendir (".");
56 if (!dir) 57 if (!dir)
57 { 58 {
58 logmsg (LOG_ERR, "cannot open directory %s: %s", 59 logmsg (LOG_ERR, _("cannot open directory %s: %s"),
59 name, strerror (errno)); 60 name, strerror (errno));
60 return 1; 61 return 1;
61 } 62 }
@@ -70,14 +71,14 @@ recursive_rmdir (const char *name)
70 71
71 if (stat (ent->d_name, &st) && errno != ENOENT) 72 if (stat (ent->d_name, &st) && errno != ENOENT)
72 { 73 {
73 logmsg (LOG_ERR, "cannot stat file `%s': %s", 74 logmsg (LOG_ERR, _("cannot stat file `%s': %s"),
74 name, strerror (errno)); 75 name, strerror (errno));
75 rc = 1; 76 rc = 1;
76 } 77 }
77 else if (S_ISDIR (st.st_mode)) 78 else if (S_ISDIR (st.st_mode))
78 rc = rmdir_r (ent->d_name); 79 rc = rmdir_r (ent->d_name);
79 else if ((rc = unlink (ent->d_name)) != 0 && errno != ENOENT) 80 else if ((rc = unlink (ent->d_name)) != 0 && errno != ENOENT)
80 logmsg (LOG_ERR, "cannot unlink %s: %s", 81 logmsg (LOG_ERR, _("cannot unlink %s: %s"),
81 ent->d_name, strerror (errno)); 82 ent->d_name, strerror (errno));
82 } 83 }
83 closedir (dir); 84 closedir (dir);
@@ -94,21 +95,21 @@ rmdir_r (const char *name)
94 95
95 if (save_cwd (&cwd)) 96 if (save_cwd (&cwd))
96 { 97 {
97 logmsg (LOG_ERR, "cannot save current directory: %s", 98 logmsg (LOG_ERR, _("cannot save current directory: %s"),
98 strerror (errno)); 99 strerror (errno));
99 return 1; 100 return 1;
100 } 101 }
101 rc = recursive_rmdir (name); 102 rc = recursive_rmdir (name);
102 if (restore_cwd (&cwd)) 103 if (restore_cwd (&cwd))
103 { 104 {
104 logmsg (LOG_ERR, "cannot restore current directory: %s", 105 logmsg (LOG_ERR, _("cannot restore current directory: %s"),
105 strerror (errno)); 106 strerror (errno));
106 rc = 1; 107 rc = 1;
107 } 108 }
108 109
109 if (rc == 0 && rmdir (name)) 110 if (rc == 0 && rmdir (name))
110 { 111 {
111 logmsg (LOG_ERR, "cannot remove directory %s: %s", 112 logmsg (LOG_ERR, _("cannot remove directory %s: %s"),
112 name, strerror (errno)); 113 name, strerror (errno));
113 return 1; 114 return 1;
114 } 115 }
@@ -121,9 +122,9 @@ static void
121remove_homedir () 122remove_homedir ()
122{ 123{
123 if (debug_level > 1) 124 if (debug_level > 1)
124 logmsg (LOG_DEBUG, "Removing GNUPG home directory: %s", homedir); 125 logmsg (LOG_DEBUG, _("removing GNUPG home directory: %s"), homedir);
125 if (rmdir_r (homedir)) 126 if (rmdir_r (homedir))
126 logmsg (LOG_CRIT, "Failed to remove GPG directory %s", homedir); 127 logmsg (LOG_CRIT, _("failed to remove GPG directory %s"), homedir);
127} 128}
128 129
129/* Create a temporary GPG home directory */ 130/* Create a temporary GPG home directory */
@@ -136,13 +137,13 @@ wydawca_gpg_homedir ()
136 homedir = xstrdup ("/tmp/wydawca-XXXXXX"); 137 homedir = xstrdup ("/tmp/wydawca-XXXXXX");
137 if (!mkdtemp (homedir)) 138 if (!mkdtemp (homedir))
138 { 139 {
139 logmsg (LOG_CRIT, "cannot create GPG home directory (%s): %s", 140 logmsg (LOG_CRIT, _("cannot create GPG home directory (%s): %s"),
140 homedir, strerror (errno)); 141 homedir, strerror (errno));
141 return 1; 142 return 1;
142 } 143 }
143 atexit (remove_homedir); 144 atexit (remove_homedir);
144 if (debug_level > 1) 145 if (debug_level > 1)
145 logmsg (LOG_DEBUG, "GNUPG home directory: %s", homedir); 146 logmsg (LOG_DEBUG, _("GNUPG home directory: %s"), homedir);
146 setenv ("GNUPGHOME", homedir, 1); 147 setenv ("GNUPGHOME", homedir, 1);
147 return 0; 148 return 0;
148} 149}
@@ -167,31 +168,31 @@ gpg_sig_ok_p (gpgme_ctx_t ctx, gpgme_signature_t sig)
167 { 168 {
168 case GPG_ERR_NO_ERROR: 169 case GPG_ERR_NO_ERROR:
169 if (debug_level) 170 if (debug_level)
170 logmsg (LOG_NOTICE, "Good signature from %s", uid); 171 logmsg (LOG_NOTICE, _("Good signature from %s"), uid);
171 break; 172 break;
172 173
173 case GPG_ERR_BAD_SIGNATURE: 174 case GPG_ERR_BAD_SIGNATURE:
174 logmsg (LOG_ERR, "BAD signature from %s", uid); 175 logmsg (LOG_ERR, _("BAD signature from %s"), uid);
175 return 0; 176 return 0;
176 177
177 case GPG_ERR_NO_PUBKEY: 178 case GPG_ERR_NO_PUBKEY:
178 logmsg (LOG_ERR, "No public key"); 179 logmsg (LOG_ERR, _("No public key"));
179 return 0; 180 return 0;
180 181
181 case GPG_ERR_NO_DATA: 182 case GPG_ERR_NO_DATA:
182 logmsg (LOG_ERR, "No signature"); 183 logmsg (LOG_ERR, _("No signature"));
183 return 0; 184 return 0;
184 185
185 case GPG_ERR_SIG_EXPIRED: 186 case GPG_ERR_SIG_EXPIRED:
186 logmsg (LOG_ERR, "Expired signature from %s", uid); 187 logmsg (LOG_ERR, _("Expired signature from %s"), uid);
187 return 0; 188 return 0;
188 189
189 case GPG_ERR_KEY_EXPIRED: 190 case GPG_ERR_KEY_EXPIRED:
190 logmsg (LOG_ERR, "Key expired (%s)", uid); 191 logmsg (LOG_ERR, _("Key expired (%s)"), uid);
191 return 0; 192 return 0;
192 193
193 default: 194 default:
194 logmsg (LOG_ERR, "Unknown signature error"); 195 logmsg (LOG_ERR, _("Unknown signature error"));
195 return 0; 196 return 0;
196 } 197 }
197 } 198 }
@@ -245,7 +246,7 @@ verify_directive_signature (struct file_triplet *trp,
245 { 246 {
246 rc = 1; 247 rc = 1;
247 UPDATE_STATS (STAT_BAD_SIGNATURE); 248 UPDATE_STATS (STAT_BAD_SIGNATURE);
248 logmsg (LOG_ERR, "%s: directive verification failed: %s", 249 logmsg (LOG_ERR, _("%s: directive verification failed: %s"),
249 trp->name, gpgme_strerror (ec)); 250 trp->name, gpgme_strerror (ec));
250 } 251 }
251 252
@@ -271,8 +272,8 @@ verify_detached_signature (struct file_triplet *trp,
271 if (!info) 272 if (!info)
272 { 273 {
273 logmsg (LOG_CRIT, 274 logmsg (LOG_CRIT,
274 "cannot find path to gpg binary (attempting to verify " 275 _("cannot find path to gpg binary (attempting to verify "
275 "the detached signature for %s", trp->name); 276 "the detached signature for %s"), trp->name);
276 return 1; 277 return 1;
277 } 278 }
278 279
@@ -287,17 +288,18 @@ verify_detached_signature (struct file_triplet *trp,
287 { 288 {
288 case exec_success: 289 case exec_success:
289 if (debug_level) 290 if (debug_level)
290 logmsg (LOG_DEBUG, "good detached signature for %s", trp->name); 291 logmsg (LOG_DEBUG, _("good detached signature for %s"), trp->name);
291 return 0; 292 return 0;
292 293
293 case exec_fail: 294 case exec_fail:
294 UPDATE_STATS (STAT_BAD_SIGNATURE); 295 UPDATE_STATS (STAT_BAD_SIGNATURE);
295 logmsg (LOG_ERR, "BAD detached signature for %s", trp->name); 296 logmsg (LOG_ERR, _("BAD detached signature for %s"), trp->name);
296 notify (spool->notification, trp, ev_bad_detached_signature); 297 notify (spool->notification, trp, ev_bad_detached_signature);
297 break; 298 break;
298 299
299 case exec_error: 300 case exec_error:
300 logmsg (LOG_CRIT, "cannot verify detached signature for %s", trp->name); 301 logmsg (LOG_CRIT, _("cannot verify detached signature for %s"),
302 trp->name);
301 break; 303 break;
302 } 304 }
303 305

Return to:

Send suggestions and report system problems to the System administrator.