diff options
-rw-r--r-- | mail/escape.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mail/escape.c b/mail/escape.c index 8675ec847..7733ec513 100644 --- a/mail/escape.c +++ b/mail/escape.c | |||
@@ -271,51 +271,54 @@ int | |||
271 | escape_bcc (int argc, char **argv, compose_env_t *env) | 271 | escape_bcc (int argc, char **argv, compose_env_t *env) |
272 | { | 272 | { |
273 | while (--argc) | 273 | while (--argc) |
274 | compose_header_set (env, MU_HEADER_BCC, *++argv, COMPOSE_SINGLE_LINE); | 274 | compose_header_set (env, MU_HEADER_BCC, *++argv, COMPOSE_SINGLE_LINE); |
275 | return 0; | 275 | return 0; |
276 | } | 276 | } |
277 | 277 | ||
278 | /* ~c[cc-list] */ | 278 | /* ~c[cc-list] */ |
279 | int | 279 | int |
280 | escape_cc (int argc, char **argv, compose_env_t *env) | 280 | escape_cc (int argc, char **argv, compose_env_t *env) |
281 | { | 281 | { |
282 | while (--argc) | 282 | while (--argc) |
283 | compose_header_set (env, MU_HEADER_CC, *++argv, COMPOSE_SINGLE_LINE); | 283 | compose_header_set (env, MU_HEADER_CC, *++argv, COMPOSE_SINGLE_LINE); |
284 | return 0; | 284 | return 0; |
285 | } | 285 | } |
286 | 286 | ||
287 | /* ~d */ | 287 | /* ~d */ |
288 | int | 288 | int |
289 | escape_deadletter (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED, | 289 | escape_deadletter (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED, |
290 | compose_env_t *env MU_ARG_UNUSED) | 290 | compose_env_t *env MU_ARG_UNUSED) |
291 | { | 291 | { |
292 | FILE *dead = fopen (getenv ("DEAD"), "r"); | 292 | FILE *dead = fopen (getenv ("DEAD"), "r"); |
293 | int c; | 293 | int c; |
294 | 294 | ||
295 | while ((c = fgetc (dead)) != EOF) | 295 | if (dead) |
296 | fputc (c, ofile); | 296 | { |
297 | fclose (dead); | 297 | while ((c = fgetc (dead)) != EOF) |
298 | fputc (c, ofile); | ||
299 | fclose (dead); | ||
300 | } | ||
298 | return 0; | 301 | return 0; |
299 | } | 302 | } |
300 | 303 | ||
301 | static int | 304 | static int |
302 | run_editor (char *ed, char *arg) | 305 | run_editor (char *ed, char *arg) |
303 | { | 306 | { |
304 | char *argv[3]; | 307 | char *argv[3]; |
305 | 308 | ||
306 | argv[0] = ed; | 309 | argv[0] = ed; |
307 | argv[1] = arg; | 310 | argv[1] = arg; |
308 | argv[2] = NULL; | 311 | argv[2] = NULL; |
309 | return mail_execute (1, 2, argv); | 312 | return mail_execute (1, 2, argv); |
310 | } | 313 | } |
311 | 314 | ||
312 | static int | 315 | static int |
313 | escape_run_editor (char *ed, int argc, char **argv, compose_env_t *env) | 316 | escape_run_editor (char *ed, int argc, char **argv, compose_env_t *env) |
314 | { | 317 | { |
315 | if (!util_getenv (NULL, "editheaders", Mail_env_boolean, 0)) | 318 | if (!util_getenv (NULL, "editheaders", Mail_env_boolean, 0)) |
316 | { | 319 | { |
317 | char *filename; | 320 | char *filename; |
318 | int fd = mu_tempfile (NULL, &filename); | 321 | int fd = mu_tempfile (NULL, &filename); |
319 | FILE *fp = fdopen (fd, "w+"); | 322 | FILE *fp = fdopen (fd, "w+"); |
320 | char buffer[512]; | 323 | char buffer[512]; |
321 | int rc; | 324 | int rc; |