X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=96fcf0bc519903f8ca0963dc7959ccebd5c29688;hp=03065c284145eaebbb62a3a5fe42017dc56d6838;hb=558b0bd9de90a9dc28f409d8f46679bf48c72ded;hpb=892df7e70376da43374d834b8a825ea2d59efd06;ds=sidebyside

diff --git a/init.c b/init.c
index 03065c2..96fcf0b 100644
--- a/init.c
+++ b/init.c
@@ -2209,37 +2209,13 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   snprintf (AttachmentMarker, sizeof(AttachmentMarker),
             "\033]9;%ld\a", (long) time (NULL));
 
-  /* on one of the systems I use, getcwd() does not return the same prefix
-     as is listed in the passwd file */
-  if ((p = getenv ("HOME")))
-    Homedir = m_strdup(p);
-
   /* Get some information about the user */
   if ((pw = getpwuid (getuid ()))) {
     char rnbuf[STRING];
-
-    Username = m_strdup(pw->pw_name);
-    if (!Homedir)
-      Homedir = m_strdup(pw->pw_dir);
-
     mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx);
     Realname = m_strdup(rnbuf);
     endpwent ();
   }
-  else {
-    if (!Homedir) {
-      mutt_endwin (NULL);
-      fputs (_("unable to determine home directory"), stderr);
-      exit (1);
-    }
-    if ((p = getenv ("USER")))
-      Username = m_strdup(p);
-    else {
-      mutt_endwin (NULL);
-      fputs (_("unable to determine username"), stderr);
-      exit (1);
-    }
-  }
 
   /* And about the host... */
   uname (&utsname);
@@ -2289,9 +2265,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
     Spoolfile = m_strdup(p);
   else {
 #ifdef HOMESPOOL
-    mutt_concat_path(buffer, sizeof(buffer), NONULL(Homedir), MAILPATH);
+    mutt_concat_path(buffer, sizeof(buffer), NONULL(MCore.homedir), MAILPATH);
 #else
-    mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(Username));
+    mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(MCore.username));
 #endif
     Spoolfile = m_strdup(buffer);
   }
@@ -2305,8 +2281,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
                    "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
   }
 
-  Tempdir = m_strdup((p = getenv ("TMPDIR")) ? p : "/tmp");
-
   if ((p = getenv ("REPLYTO")) != NULL) {
     BUFFER buf, token;
 
@@ -2342,10 +2316,10 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   mutt_init_history ();
 
   if (!Muttrc) {
-      snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL (Homedir));
+      snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(MCore.homedir));
     if (access (buffer, F_OK) == -1)
       snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
-                NONULL (Homedir));
+                NONULL(MCore.homedir));
 
     default_rc = 1;
     Muttrc = m_strdup(buffer);
@@ -2398,9 +2372,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   }
 
   /* LUA {{{ */
-  snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(Homedir));
+  snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(MCore.homedir));
   if (access(buffer, F_OK) < 0)
-      snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(Homedir));
+      snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(MCore.homedir));
   if (!access(buffer, F_OK)) {
       need_pause = luaM_wrap(mutt_error, luaM_dofile(buffer));
   }