X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=6ca24b377334e76c148e6ea3dc3df87712e25c1c;hp=63b34702b81d07e3a913c7b19f56489b541b359c;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hpb=21595f98b7c8132f99abb9fee60ecdce31fc980f

diff --git a/init.c b/init.c
index 63b3470..6ca24b3 100644
--- a/init.c
+++ b/init.c
@@ -16,6 +16,7 @@
 
 #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>
@@ -207,7 +208,7 @@ static int bool_from_string (struct option_t* dst, const char* val,
 static void num_to_string (char* dst, size_t dstlen,
                            struct option_t* option) {
   /* XXX puke */
-  const char* fmt = (str_cmp (option->option, "umask") == 0) ?
+  const char* fmt = (m_strcmp(option->option, "umask") == 0) ?
                     "%s=%04o" : "%s=%d";
   snprintf (dst, dstlen, fmt, option->option,
             *((short*) option->data));
@@ -427,7 +428,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
   if (!dst)
     return (0);
 
-  if (option (OPTATTACHMSG) && !str_cmp (dst->option, "reply_regexp")) {
+  if (option (OPTATTACHMSG) && !m_strcmp(dst->option, "reply_regexp")) {
     if (errbuf)
       snprintf (errbuf, errlen,
                 "Operation not permitted when in attach-message mode.");
@@ -440,14 +441,14 @@ static int rx_from_string (struct option_t* dst, const char* val,
   p = (rx_t*) dst->data;
 
   /* something to do? */
-  if (!val || !*val || (p->pattern && str_cmp (p->pattern, val) == 0))
+  if (!val || !*val || (p->pattern && m_strcmp(p->pattern, val) == 0))
     return (1);
 
-  if (str_cmp (dst->option, "mask") != 0)
+  if (m_strcmp(dst->option, "mask") != 0)
     flags |= mutt_which_case (val);
 
   s = (char*) val;
-  if (str_cmp (dst->option, "mask") == 0 && *s == '!') {
+  if (m_strcmp(dst->option, "mask") == 0 && *s == '!') {
     not = 1;
     s++;
   }
@@ -470,7 +471,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
   p->rx = rx;
   p->not = not;
 
-  if (str_cmp (dst->option, "reply_regexp") == 0)
+  if (m_strcmp(dst->option, "reply_regexp") == 0)
     mutt_adjust_all_subjects ();
 
   return (1);
@@ -749,7 +750,7 @@ static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
   spam = *list;
   if (!spam)
     return 0;
-  if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
+  if (spam->rx && !m_strcmp(spam->rx->pattern, pat)) {
     *list = spam->next;
     rx_free (&spam->rx);
     p_delete(&spam->template);
@@ -759,7 +760,7 @@ static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
 
   prev = spam;
   for (spam = prev->next; spam;) {
-    if (!str_cmp (spam->rx->pattern, pat)) {
+    if (!m_strcmp(spam->rx->pattern, pat)) {
       prev->next = spam->next;
       rx_free (&spam->rx);
       p_delete(&spam->template);
@@ -779,7 +780,7 @@ static void remove_from_list (LIST ** l, const char *str)
 {
   LIST *p, *last = NULL;
 
-  if (str_cmp ("*", str) == 0)
+  if (m_strcmp("*", str) == 0)
     mutt_free_list (l);         /* ``unCMD *'' means delete all current entries */
   else {
     p = *l;
@@ -805,7 +806,7 @@ static int remove_from_rx_list (list2_t** l, const char *str)
 {
   int i = 0;
 
-  if (str_cmp ("*", str) == 0) {
+  if (m_strcmp("*", str) == 0) {
     list_del (l, (list_del_t*) rx_free);
     return (0);
   }
@@ -959,7 +960,7 @@ static int parse_unalternates (BUFFER * buf, BUFFER * s, unsigned long data,
     mutt_extract_token (buf, s, 0);
     remove_from_rx_list (&Alternates, buf->data);
 
-    if (str_cmp (buf->data, "*") &&
+    if (m_strcmp(buf->data, "*") &&
         add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0)
       return -1;
 
@@ -1015,7 +1016,7 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
     /* nospam only ever has one parameter. */
 
     /* "*" is a special case. */
-    if (!str_cmp (buf->data, "*")) {
+    if (!m_strcmp(buf->data, "*")) {
       mutt_free_spam_list (&SpamList);
       list_del (&NoSpamList, (list_del_t*) rx_free);
       return 0;
@@ -1045,7 +1046,7 @@ static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
     /*
      * Check for deletion of entire list
      */
-    if (str_cmp (buf->data, "*") == 0) {
+    if (m_strcmp(buf->data, "*") == 0) {
       mutt_free_list ((LIST **) data);
       break;
     }
@@ -1320,7 +1321,7 @@ static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data,
     remove_from_rx_list (&SubscribedLists, buf->data);
     remove_from_rx_list (&MailLists, buf->data);
 
-    if (str_cmp (buf->data, "*") &&
+    if (m_strcmp(buf->data, "*") &&
         add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0)
       return -1;
   }
@@ -1354,7 +1355,7 @@ static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data,
     mutt_extract_token (buf, s, 0);
     remove_from_rx_list (&SubscribedLists, buf->data);
 
-    if (str_cmp (buf->data, "*") &&
+    if (m_strcmp(buf->data, "*") &&
         add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0)
       return -1;
   }
@@ -1371,7 +1372,7 @@ static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
   do {
     mutt_extract_token (buf, s, 0);
 
-    if (str_cmp ("*", buf->data) == 0) {
+    if (m_strcmp("*", buf->data) == 0) {
       if (CurrentMenu == MENU_ALIAS) {
         for (tmp = Aliases; tmp; tmp = tmp->next)
           tmp->del = 1;
@@ -1483,7 +1484,7 @@ parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
 
   do {
     mutt_extract_token (buf, s, 0);
-    if (str_cmp ("*", buf->data) == 0)
+    if (m_strcmp("*", buf->data) == 0)
       mutt_free_list (&UserHeader);
     else {
       tmp = UserHeader;
@@ -1619,7 +1620,7 @@ static struct option_t* add_user_option (const char* name) {
 
 /* free()'s option_t* */
 static void del_option (void* p) {
-  struct option_t* ptr = (struct option_t*) p;
+  struct option_t *ptr = (struct option_t*) p;
   char* s = (char*) ptr->data;
   debug_print (1, ("removing option '%s' from table\n", NONULL (ptr->option)));
   p_delete(&ptr->option);
@@ -1780,7 +1781,7 @@ static int check_special (const char* name, unsigned long val,
   int i = 0;
 
   for (i = 0; SpecialVars[i].name; i++) {
-    if (str_cmp (SpecialVars[i].name, name) == 0) {
+    if (m_strcmp(SpecialVars[i].name, name) == 0) {
       return (SpecialVars[i].check (SpecialVars[i].name,
                                     val, errbuf, errlen));
     }
@@ -1873,7 +1874,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       }
     }
 
-    if (!option && !(reset && str_cmp ("all", tmp->data) == 0)) {
+    if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
       snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
       return (-1);
     }
@@ -1890,7 +1891,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         return (-1);
       }
 
-      if (!str_cmp ("all", tmp->data)) {
+      if (!m_strcmp("all", tmp->data)) {
         if (CurrentMenu == MENU_PAGER) {
           snprintf (err->data, err->dsize, _("Not available in this menu."));
           return (-1);
@@ -2185,7 +2186,7 @@ int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
     }
     mutt_extract_token (token, &expn, 0);
     for (i = 0; Commands[i].name; i++) {
-      if (!str_cmp (token->data, Commands[i].name)) {
+      if (!m_strcmp(token->data, Commands[i].name)) {
         if (Commands[i].func (token, &expn, Commands[i].data, err) != 0)
           goto finish;
         break;
@@ -2281,7 +2282,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
                 Matches[(numtabs - 2) % Num_matched]);
 
     /* return the completed command */
-    strncpy (buffer, Completed, len - spaces);
+    m_strcpy(buffer, len - spaces, Completed);
   }
   else if (!str_ncmp (buffer, "set", 3)
            || !str_ncmp (buffer, "unset", 5)
@@ -2329,7 +2330,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
       snprintf (Completed, sizeof(Completed), "%s",
                 Matches[(numtabs - 2) % Num_matched]);
 
-    strncpy (pt, Completed, buffer + len - pt - spaces);
+    m_strcpy(pt, buffer + len - pt - spaces, Completed);
   }
   else if (!str_ncmp (buffer, "exec", 4)) {
     struct binding_t *menu = km_get_table (CurrentMenu);
@@ -2373,7 +2374,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
       snprintf (Completed, sizeof(Completed), "%s",
                 Matches[(numtabs - 2) % Num_matched]);
 
-    strncpy (pt, Completed, buffer + len - pt - spaces);
+    m_strcpy(pt, buffer + len - pt - spaces, Completed);
   }
   else
     return 0;
@@ -2685,9 +2686,9 @@ void mutt_init (int skip_sys_rc, LIST * commands)
     Spoolfile = m_strdup(p);
   else {
 #ifdef HOMESPOOL
-    mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof(buffer));
+    mutt_concat_path(buffer, sizeof(buffer), NONULL(Homedir), MAILPATH);
 #else
-    mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof(buffer));
+    mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(Username));
 #endif
     Spoolfile = m_strdup(buffer);
   }
@@ -2883,7 +2884,7 @@ int mutt_get_hook_type (const char *name)
 
 /* compare two option_t*'s for sorting -t/-T output */
 static int opt_cmp (const void* a, const void* b) {
-  return (str_cmp ((*(struct option_t**) a)->option,
+  return (m_strcmp((*(struct option_t**) a)->option,
                        (*(struct option_t**) b)->option));
 }
 
@@ -2909,7 +2910,7 @@ static void opt_sel_diff (const char* key, void* data,
     return;
 
   mutt_option_value (option->option, buf, sizeof(buf));
-  if (str_cmp (buf, option->init) != 0)
+  if (m_strcmp(buf, option->init) != 0)
     list_push_back (l, option);
 }