push username, homedir and tmpdir in lua too.

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index d8b94aa..48644d8 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -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(MCore.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(MCore.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), MCore.homedir);
             tail = s + 1;
         } else {
             struct passwd *pw;
@@ -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, MCore.homedir, (len = m_strlen(MCore.homedir))) == 0
+           && s[len] == '/') {
     *s++ = '~';
     memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);
   }