merge OPS that do not need to be split anymore.

[apps/madmutt.git] / init.c

diff --git a/init.c b/init.c
index 4fe7d96..f71f363 100644 (file)
--- a/init.c
+++ b/init.c
@@ -10,26 +10,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+#include <lib-lib/lib-lib.h>
 #include <sys/utsname.h>
-#include <errno.h>
-#include <sys/wait.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/mapping.h>
-#include <lib-lib/rx.h>
 
 #include <lib-sys/unix.h>
 #include <lib-sys/mutt_ssl.h>
@@ -256,14 +238,14 @@ static void sys_to_string (char* dst, ssize_t dstlen,
   int clean = 0;
 
   /* get some $madmutt_ values dynamically */
-  if (ascii_strcmp ("madmutt_pwd", option->option) == 0) {
+  if (m_strcmp("madmutt_pwd", option->option) == 0) {
     val = p_new(char, _POSIX_PATH_MAX);
     val = getcwd (val, _POSIX_PATH_MAX-1);
     clean = 1;
-  } else if (ascii_strcmp ("madmutt_folder_path", option->option) == 0 &&
+  } else if (m_strcmp("madmutt_folder_path", option->option) == 0 &&
              CurrentFolder && *CurrentFolder) {
     val = CurrentFolder;
-  } else if (ascii_strcmp ("madmutt_folder_name", option->option) == 0 &&
+  } else if (m_strcmp("madmutt_folder_name", option->option) == 0 &&
              CurrentFolder && *CurrentFolder) {
 
     ssize_t Maildirlength = m_strlen(Maildir);
@@ -569,7 +551,7 @@ static void syn_del (void** p) {
   p_delete(p);
 }
 
-void toggle_quadoption (int opt)
+static void toggle_quadoption (int opt)
 {
   int n = opt / 4;
   int b = (opt % 4) * 2;
@@ -1405,7 +1387,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s,
 {
   alias_t *tmp = Aliases;
   alias_t *last = NULL;
-  const char *estr = NULL;
+  char *estr = NULL;
 
   if (!MoreArgs (s)) {
     m_strcpy(err->data, err->dsize, _("alias: no address"));
@@ -1446,6 +1428,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s,
   if (mutt_addrlist_to_idna (tmp->addr, &estr)) {
     snprintf (err->data, err->dsize,
               _("Warning: Bad IDN '%s' in alias '%s'.\n"), estr, tmp->name);
+    p_delete(&estr);
     return -1;
   }
 
@@ -1828,7 +1811,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
     }
 
     /* see if we need to add $user_ var */
-    if (!option && ascii_strncmp ("user_", tmp->data, 5) == 0) {
+    if (!option && m_strncmp("user_", tmp->data, 5) == 0) {
       /* there's no option named like this yet so only add one
        * if the action isn't any of: reset, unset, query */
       if (!(reset || unset || query || *s->dptr != '=')) {
@@ -2669,12 +2652,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
 
   CurrentMenu = MENU_MAIN;
 
-  /* Do we have a locale definition? */
-  if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
-      ((p = getenv ("LANG")) != NULL && p[0]) ||
-      ((p = getenv ("LC_CTYPE")) != NULL && p[0]))
-    set_option (OPTLOCALES);
-
 #ifdef HAVE_GETSID
   /* Unset suspend by default if we're the session leader */
   if (getsid (0) == getpid ())
@@ -2683,22 +2660,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
 
   mutt_init_history ();
 
-
-
-
-  /*
-   *
-   *                       BIG FAT WARNING
-   *
-   * When changing the code which looks for a configuration file,
-   * please also change the corresponding code in muttbug.sh.in.
-   *
-   *
-   */
-
-
-
-
   if (!Muttrc) {
 #if 0
     snprintf (buffer, sizeof(buffer), "%s/.madmuttrc-%s", NONULL (Homedir),