Changed mda() declaration.
Showing
2 changed files
with
3 additions
and
14 deletions
... | @@ -102,7 +102,7 @@ extern int exit_code; | ... | @@ -102,7 +102,7 @@ extern int exit_code; |
102 | extern void setgroupquota (char *str); | 102 | extern void setgroupquota (char *str); |
103 | extern int check_quota (char *name, size_t size, size_t *rest); | 103 | extern int check_quota (char *name, size_t size, size_t *rest); |
104 | 104 | ||
105 | int mda (FILE *fp, char *username, mailbox_t mbox); | 105 | int mda (FILE *fp, char *username); |
106 | char *make_progfile_name (char *pattern, char *username); | 106 | char *make_progfile_name (char *pattern, char *username); |
107 | 107 | ||
108 | #ifdef WITH_GUILE | 108 | #ifdef WITH_GUILE | ... | ... |
... | @@ -236,7 +236,7 @@ main (int argc, char *argv[]) | ... | @@ -236,7 +236,7 @@ main (int argc, char *argv[]) |
236 | 236 | ||
237 | unlink (tempfile); | 237 | unlink (tempfile); |
238 | for (; *argv; argv++) | 238 | for (; *argv; argv++) |
239 | mda (fp, *argv, NULL); | 239 | mda (fp, *argv); |
240 | return exit_code; | 240 | return exit_code; |
241 | } | 241 | } |
242 | 242 | ||
... | @@ -315,19 +315,8 @@ make_progfile_name (char *pattern, char *username) | ... | @@ -315,19 +315,8 @@ make_progfile_name (char *pattern, char *username) |
315 | } | 315 | } |
316 | 316 | ||
317 | int | 317 | int |
318 | mda (FILE *fp, char *username, mailbox_t mbox) | 318 | mda (FILE *fp, char *username) |
319 | { | 319 | { |
320 | if (mbox) | ||
321 | { | ||
322 | message_t mesg = NULL; | ||
323 | attribute_t attr = NULL; | ||
324 | |||
325 | mailbox_get_message (mbox, 1, &mesg); | ||
326 | message_get_attribute (mesg, &attr); | ||
327 | if (attribute_is_deleted (attr)) | ||
328 | return EX_OK; | ||
329 | } | ||
330 | |||
331 | deliver (fp, username); | 320 | deliver (fp, username); |
332 | 321 | ||
333 | if (multiple_delivery) | 322 | if (multiple_delivery) | ... | ... |
-
Please register or sign in to post a comment