streamline headers

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index d8b94aa..1dcd5eb 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -13,7 +13,7 @@
 #include <grp.h>
 #include <pwd.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/enter.h>
 #include <lib-sys/unix.h>
 #include <imap/imap.h>
@@ -32,7 +32,7 @@ void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
 {
     int fd;
 
-    fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(Tempdir) : dir, s);
+    fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(mod_core.tmpdir) : dir, s);
     if (fd < 0) {
         *s = '\0';
     } else {
@@ -43,7 +43,7 @@ void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
 
 void mutt_mktemp(char *s)
 {
-    int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(Tempdir), NULL);
+    int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(mod_core.tmpdir), NULL);
     if (fd < 0) {
         *s = '\0';
     } else {
@@ -62,7 +62,7 @@ ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx)
     switch (*s) {
       case '~':
         if (s[1] == '/' || s[1] == '\0') {
-            m_strcpy(p, sizeof(p), Homedir);
+            m_strcpy(p, sizeof(p), mod_core.homedir);
             tail = s + 1;
         } else {
             struct passwd *pw;
@@ -115,7 +115,7 @@ ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx)
         break;
 
       case '<':
-        m_strcpy(p, sizeof(p), Outbox);
+        m_strcpy(p, sizeof(p), MAlias.record);
         tail = s + 1;
         break;
 
@@ -199,8 +199,8 @@ void mutt_pretty_mailbox (char *s)
     *s++ = '=';
     memmove (s, s + len, m_strlen(s + len) + 1);
   }
-  else if (m_strncmp(s, Homedir, (len = m_strlen(Homedir))) == 0 &&
-           s[len] == '/') {
+  else if (m_strncmp(s, mod_core.homedir, (len = m_strlen(mod_core.homedir))) == 0
+           && s[len] == '/') {
     *s++ = '~';
     memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);
   }
@@ -278,13 +278,7 @@ int mutt_check_overwrite (const char *attname, const char *path,
 void mutt_save_path(char *d, ssize_t dsize, address_t *a)
 {
     if (a && a->mailbox) {
-        m_strcpy(d, dsize, a->mailbox);
-
-        if (!option(OPTSAVEADDRESS)) {
-            char *p = strpbrk(d, "%@");
-            if (p)
-                *p = '\0';
-        }
+        m_strncpy(d, dsize, a->mailbox, strcspn(d, "%@"));
         m_strtolower(d);
     } else {
         *d = '\0';
@@ -318,14 +312,6 @@ int mutt_save_confirm (const char *s, struct stat *st)
     return 1;
   }
 
-#ifdef USE_NNTP
-  if (magic == M_NNTP) {
-    mutt_error _("Can't save message to newsserver.");
-
-    return 0;
-  }
-#endif
-
   if (magic > 0 && !mx_access (s, W_OK)) {
     if (option (OPTCONFIRMAPPEND) &&
         (!TrashPath || (m_strcmp(s, TrashPath) != 0))) {
@@ -363,8 +349,6 @@ int mutt_save_confirm (const char *s, struct stat *st)
       }
     }
   }
-
-  CLEARLINE (LINES - 1);
   return (ret);
 }