diff options
author | José Fonseca <jrfonseca@users.sourceforge.net> | 2003-07-04 16:28:14 +0000 |
---|---|---|
committer | José Fonseca <jrfonseca@users.sourceforge.net> | 2003-07-04 16:28:14 +0000 |
commit | cd2170b37673352903432c4851a31168a5e5e5bb (patch) | |
tree | 4d8f8e90808274ea0b4930724052a41e8d4acea5 /main.c | |
parent | 15350708d628c8be91ca0ac00ec7956bbf3f6c80 (diff) |
Search for the global configuration file.
Do not make the CRLF line translation for the MDA pipe.
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 22 |
1 files changed, 7 insertions, 15 deletions
@@ -13,6 +13,7 @@ #include "message.h" #include "smtp.h" #include "local.h" +#include "rcfile.h" /** Modes of operation. */ @@ -35,14 +36,12 @@ int main (int argc, char **argv) enum notify_flags notify = Notify_NOTSET; char *from = NULL; message_t *message; - int parse_headers, local, remote; + int parse_headers = 0, local, remote; opmode_t mode; + char *rcfile = NULL; identities_init(); - /* Parse the rc file. */ - parse_rcfile(); - /* Set the default mode of operation. */ if (strcmp(argv[0], "mailq") == 0) { mode = MAILQ; @@ -298,6 +297,9 @@ int main (int argc, char **argv) exit (EX_USAGE); } + /* Parse the rc file. */ + rcfile_parse(rcfile); + message = message_new(); /** Parse the envelope headers */ @@ -330,18 +332,8 @@ int main (int argc, char **argv) else { local_init(message); - smtp_send(message); - - if(ferror(mda_fp)) - { - perror(NULL); - exit(EX_OSERR); - } - - if(!message_eof(message)) - local_flush(message); - + local_flush(message); local_cleanup(); } |