Users don't know what they are doing most of the time…

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index 666ccba..a81949c 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -10,7 +10,6 @@
 #include <lib-lib/lib-lib.h>
 
 #include <signal.h>
-#include <sys/utsname.h>
 
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/exit.h>
@@ -28,10 +27,7 @@
 #include "pager.h"
 #include "charset.h"
 #include "mutt_idna.h"
-
-#ifdef USE_LIBESMTP
-# include "mutt_libesmtp.h"
-#endif /* USE_LIBESMTP */
+#include "mutt_libesmtp.h"
 
 #ifdef USE_NNTP
 #include <nntp/nntp.h>
@@ -767,10 +763,10 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
 
   if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) {
     const char *chs = parameter_getval(b->parameter, "charset");
-    char *fchs = b->use_disp ? ((FileCharset && *FileCharset) ?
-                                FileCharset : Charset) : Charset;
-    if (Charset && (chs || SendCharset) &&
-        convert_file_from_to (fp, fchs, chs ? chs : SendCharset,
+    char *fchs = b->use_disp && !m_strisempty(MCharset.file_charset)
+        ? FileCharset : MCharset.charset;
+    if (MCharset.charset && (chs || MCharset.send_charset) &&
+        convert_file_from_to (fp, fchs, chs ? chs : MCharset.send_charset,
                               &fromcode, &tocode, info) != -1) {
       if (!chs) {
         charset_canonicalize (chsbuf, sizeof (chsbuf), tocode);
@@ -793,7 +789,8 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
   if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
     parameter_setval(&b->parameter, "charset",
                      (!info->hibin ? "us-ascii"
-                      : Charset && !charset_is_us_ascii(Charset) ? Charset : "unknown-8bit"));
+                      : MCharset.charset && !charset_is_us_ascii(MCharset.charset)
+                                         ? MCharset.charset : "unknown-8bit"));
 
   return info;
 }
@@ -1497,16 +1494,12 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
   }
 
   if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
-    const char *os;
-
-    if (OperatingSystem != NULL) {
-      os = OperatingSystem;
+    if (MCore.operating_system) {
+      fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(),
+              MCore.operating_system);
     } else {
-      struct utsname un;
-      os = (uname(&un) == -1) ? "UNIX" : un.sysname;
+      fprintf(fp, "User-Agent: %s\n", mutt_make_version());
     }
-    /* Add a vanity header */
-    fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version(), os);
   }
 
   return (ferror (fp) == 0 ? 0 : -1);
@@ -1538,22 +1531,22 @@ static void encode_headers (string_list_t * h)
   }
 }
 
-const char *mutt_fqdn (short may_hide_host)
+const char *mutt_fqdn(short may_hide_host)
 {
   char *p = NULL, *q;
 
-  if (Fqdn && Fqdn[0] != '@') {
-    p = Fqdn;
+  if (MCore.hostname && MCore.hostname[0] != '@') {
+    p = MCore.hostname;
 
     if (may_hide_host && option (OPTHIDDENHOST)) {
-      if ((p = strchr (Fqdn, '.')))
+      if ((p = strchr(MCore.hostname, '.')))
         p++;
 
       /* sanity check: don't hide the host if
          the fqdn is something like detebe.org.  */
 
-      if (!p || !(q = strchr (p, '.')))
-        p = Fqdn;
+      if (!p || !(q = strchr(p, '.')))
+        p = MCore.hostname;
     }
   }
 
@@ -1656,7 +1649,7 @@ static char *mutt_gen_msgid (void)
     const char *fqdn;
 
     if (!(fqdn = mutt_fqdn(0)))
-        fqdn = NONULL(Hostname);
+        fqdn = NONULL(MCore.shorthost);
 
     mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat);
     snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn);
@@ -1689,7 +1682,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile)
   sigaddset (&set, SIGTSTP);
   sigprocmask (SIG_BLOCK, &set, NULL);
 
-  if (SendmailWait >= 0) {
+  if (MTransport.sendmail_wait >= 0) {
     char tmp[_POSIX_PATH_MAX];
 
     mutt_mktemp (tmp);
@@ -1720,7 +1713,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile)
       }
       unlink (msg);
 
-      if (SendmailWait >= 0) {
+      if (MTransport.sendmail_wait >= 0) {
         /* *tempfile will be opened as stdout */
         if (open (*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) <
             0)
@@ -1744,11 +1737,11 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile)
       _exit (S_ERR);
     }
 
-    /* SendmailWait > 0: interrupt waitpid() after SendmailWait seconds
-     * SendmailWait = 0: wait forever
-     * SendmailWait < 0: don't wait
+    /* sendmail_wait > 0: interrupt waitpid() after sendmail_wait seconds
+     * sendmail_wait = 0: wait forever
+     * sendmail_wait < 0: don't wait
      */
-    if (SendmailWait > 0) {
+    if (MTransport.sendmail_wait > 0) {
       SigAlrm = 0;
       act.sa_handler = alarm_handler;
 #ifdef SA_INTERRUPT
@@ -1759,20 +1752,20 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile)
 #endif
       sigemptyset (&act.sa_mask);
       sigaction (SIGALRM, &act, &oldalrm);
-      alarm (SendmailWait);
+      alarm (MTransport.sendmail_wait);
     }
-    else if (SendmailWait < 0)
+    else if (MTransport.sendmail_wait < 0)
       _exit (0xff & EX_OK);
 
     if (waitpid (pid, &st, 0) > 0) {
       st = WIFEXITED (st) ? WEXITSTATUS (st) : S_ERR;
-      if (SendmailWait && st == (0xff & EX_OK)) {
+      if (MTransport.sendmail_wait && st == (0xff & EX_OK)) {
         unlink (*tempfile);     /* no longer needed */
         p_delete(tempfile);
       }
     } else {
-      st = (SendmailWait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR;
-      if (SendmailWait > 0) {
+      st = (MTransport.sendmail_wait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR;
+      if (MTransport.sendmail_wait > 0) {
         unlink (*tempfile);
         p_delete(tempfile);
       }
@@ -1876,14 +1869,12 @@ static int mutt_invoke_sendmail (address_t * from,        /* the sender */
 #ifdef USE_NNTP
   if (!option (OPTNEWSSEND)) {
 #endif
-    if (eightbit && option (OPTUSE8BITMIME))
+    if (eightbit && MTransport.use_8bitmime)
       args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
 
-    if (option (OPTENVFROM)) {
-      address_t *f = EnvFrom;
-      if (EnvFrom)
-        f = EnvFrom;
-      else if (from && !from->next)
+    if (MTransport.use_envelope_from) {
+      address_t *f = MTransport.envelope_from_address;
+      if (!f && from && !from->next)
         f = from;
       if (f) {
         args = add_option (args, &argslen, &argsmax, "-f");
@@ -1986,12 +1977,7 @@ void mutt_prepare_envelope (ENVELOPE * env, int final)
   rfc2047_encode_adrlist(env->reply_to, "Reply-To");
 
   if (env->subject)
-#ifdef USE_NNTP
-    if (!option (OPTNEWSSEND) || option (OPTMIMESUBJECT))
-#endif
-    {
-      rfc2047_encode_string (&env->subject);
-    }
+    rfc2047_encode_string (&env->subject);
   encode_headers (env->userhdrs);
 }