X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=complete.c;h=bd2bb052be5a5f2a568b17bab598ba30b94ab237;hp=1066b5c3a48e5fb0bbdb0c0c81c60e4543e46a8b;hb=b36dc16c428cc2b1371bb99c0581aa014f302791;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/complete.c b/complete.c
index 1066b5c..bd2bb05 100644
--- a/complete.c
+++ b/complete.c
@@ -13,14 +13,16 @@
 
 #include "mutt.h"
 #ifdef USE_IMAP
-#include "mailbox.h"
+#include "mx.h"
 #include "imap.h"
 #endif
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
 
-#include "lib/str.h"
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
+#include "lib/debug.h"
 
 #include <dirent.h>
 #include <string.h>
@@ -47,24 +49,24 @@ int mutt_complete (char *s, size_t slen)
   char imap_path[LONG_STRING];
 #endif
 
-  dprint (2, (debugfile, "mutt_complete: completing %s\n", s));
+  debug_print (2, ("completing %s\n", s));
 
 #ifdef USE_NNTP
   if (option (OPTNEWS)) {
     LIST *l = CurrentNewsSrv->list;
 
-    strfcpy (filepart, s, sizeof (filepart));
+    m_strcpy(filepart, sizeof(filepart), s);
 
     /*
      * special case to handle when there is no filepart yet.
      * find the first subscribed newsgroup
      */
-    if ((len = mutt_strlen (filepart)) == 0) {
+    if ((len = m_strlen(filepart)) == 0) {
       for (; l; l = l->next) {
         NNTP_DATA *data = (NNTP_DATA *) l->data;
 
         if (data && data->subscribed) {
-          strfcpy (filepart, data->group, sizeof (filepart));
+          m_strcpy(filepart, sizeof(filepart), data->group);
           init++;
           l = l->next;
           break;
@@ -76,7 +78,7 @@ int mutt_complete (char *s, size_t slen)
       NNTP_DATA *data = (NNTP_DATA *) l->data;
 
       if (data && data->subscribed &&
-          mutt_strncmp (data->group, filepart, len) == 0) {
+          m_strncmp(data->group, filepart, len) == 0) {
         if (init) {
           for (i = 0; filepart[i] && data->group[i]; i++) {
             if (filepart[i] != data->group[i]) {
@@ -87,7 +89,7 @@ int mutt_complete (char *s, size_t slen)
           filepart[i] = 0;
         }
         else {
-          strfcpy (filepart, data->group, sizeof (filepart));
+          m_strcpy(filepart, sizeof(filepart), data->group);
           init = 1;
         }
       }
@@ -102,17 +104,13 @@ int mutt_complete (char *s, size_t slen)
 #ifdef USE_IMAP
   /* we can use '/' as a delimiter, imap_complete rewrites it */
   if (*s == '=' || *s == '+' || *s == '!') {
-    if (*s == '!')
-      p = NONULL (Spoolfile);
-    else
-      p = NONULL (Maildir);
-
-    mutt_concat_path (imap_path, p, s + 1, sizeof (imap_path));
+      const char *q = NONULL(*s == '!' ? Spoolfile : Maildir);
+      mutt_concat_path(imap_path, sizeof(imap_path), q, s + 1);
   }
   else
-    strfcpy (imap_path, s, sizeof (imap_path));
+    m_strcpy(imap_path, sizeof(imap_path), s);
 
-  if (mx_is_imap (imap_path))
+  if (mx_get_magic (imap_path) == M_IMAP)
     return imap_complete (s, slen, imap_path);
 #endif
 
@@ -120,40 +118,40 @@ int mutt_complete (char *s, size_t slen)
     dirpart[0] = *s;
     dirpart[1] = 0;
     if (*s == '!')
-      strfcpy (exp_dirpart, NONULL (Spoolfile), sizeof (exp_dirpart));
+      m_strcpy(exp_dirpart, sizeof(exp_dirpart), NONULL(Spoolfile));
     else
-      strfcpy (exp_dirpart, NONULL (Maildir), sizeof (exp_dirpart));
+      m_strcpy(exp_dirpart, sizeof(exp_dirpart), NONULL(Maildir));
     if ((p = strrchr (s, '/'))) {
       char buf[_POSIX_PATH_MAX];
 
       *p++ = 0;
-      mutt_concat_path (buf, exp_dirpart, s + 1, sizeof (buf));
-      strfcpy (exp_dirpart, buf, sizeof (exp_dirpart));
+      mutt_concat_path(buf, sizeof(buf), exp_dirpart, s + 1);
+      m_strcpy(exp_dirpart, sizeof(exp_dirpart), buf);
       snprintf (buf, sizeof (buf), "%s%s/", dirpart, s + 1);
-      strfcpy (dirpart, buf, sizeof (dirpart));
-      strfcpy (filepart, p, sizeof (filepart));
+      m_strcpy(dirpart, sizeof(dirpart), buf);
+      m_strcpy(filepart, sizeof(filepart), p);
     }
     else
-      strfcpy (filepart, s + 1, sizeof (filepart));
+      m_strcpy(filepart, sizeof(filepart), s + 1);
     dirp = opendir (exp_dirpart);
   }
   else {
     if ((p = strrchr (s, '/'))) {
       if (p == s) {             /* absolute path */
         p = s + 1;
-        strfcpy (dirpart, "/", sizeof (dirpart));
+        m_strcpy(dirpart, sizeof(dirpart), "/");
         exp_dirpart[0] = 0;
-        strfcpy (filepart, p, sizeof (filepart));
+        m_strcpy(filepart, sizeof(filepart), p);
         dirp = opendir (dirpart);
       }
       else {
         *p = 0;
         len = (size_t) (p - s);
-        strncpy (dirpart, s, len);
+        memcpy(dirpart, s, len);
         dirpart[len] = 0;
         p++;
-        strfcpy (filepart, p, sizeof (filepart));
-        strfcpy (exp_dirpart, dirpart, sizeof (exp_dirpart));
+        m_strcpy(filepart, sizeof(filepart), p);
+        m_strcpy(exp_dirpart, sizeof(exp_dirpart), dirpart);
         mutt_expand_path (exp_dirpart, sizeof (exp_dirpart));
         dirp = opendir (exp_dirpart);
       }
@@ -161,15 +159,13 @@ int mutt_complete (char *s, size_t slen)
     else {
       /* no directory name, so assume current directory. */
       dirpart[0] = 0;
-      strfcpy (filepart, s, sizeof (filepart));
+      m_strcpy(filepart, sizeof(filepart), s);
       dirp = opendir (".");
     }
   }
 
   if (dirp == NULL) {
-    dprint (1,
-            (debugfile, "mutt_complete(): %s: %s (errno %d).\n", exp_dirpart,
-             strerror (errno), errno));
+    debug_print (1, ("%s: %s (errno %d).\n", exp_dirpart, strerror (errno), errno));
     return (-1);
   }
 
@@ -177,11 +173,11 @@ int mutt_complete (char *s, size_t slen)
    * special case to handle when there is no filepart yet.  find the first
    * file/directory which is not ``.'' or ``..''
    */
-  if ((len = mutt_strlen (filepart)) == 0) {
+  if ((len = m_strlen(filepart)) == 0) {
     while ((de = readdir (dirp)) != NULL) {
-      if (mutt_strcmp (".", de->d_name) != 0
-          && mutt_strcmp ("..", de->d_name) != 0) {
-        strfcpy (filepart, de->d_name, sizeof (filepart));
+      if (m_strcmp(".", de->d_name) != 0
+          && m_strcmp("..", de->d_name) != 0) {
+        m_strcpy(filepart, sizeof(filepart), de->d_name);
         init++;
         break;
       }
@@ -189,7 +185,7 @@ int mutt_complete (char *s, size_t slen)
   }
 
   while ((de = readdir (dirp)) != NULL) {
-    if (mutt_strncmp (de->d_name, filepart, len) == 0) {
+    if (m_strncmp(de->d_name, filepart, len) == 0) {
       if (init) {
         for (i = 0; filepart[i] && de->d_name[i]; i++) {
           if (filepart[i] != de->d_name[i]) {
@@ -203,19 +199,19 @@ int mutt_complete (char *s, size_t slen)
         char buf[_POSIX_PATH_MAX];
         struct stat st;
 
-        strfcpy (filepart, de->d_name, sizeof (filepart));
+        m_strcpy(filepart, sizeof(filepart), de->d_name);
 
         /* check to see if it is a directory */
         if (dirpart[0]) {
-          strfcpy (buf, exp_dirpart, sizeof (buf));
-          strfcpy (buf + mutt_strlen (buf), "/", sizeof (buf) - mutt_strlen (buf));
+          m_strcpy(buf, sizeof(buf), exp_dirpart);
+          m_strcpy(buf + m_strlen(buf), sizeof(buf) - m_strlen(buf), "/");
         }
         else
           buf[0] = 0;
-        strfcpy (buf + mutt_strlen (buf), filepart, sizeof (buf) - mutt_strlen (buf));
+        m_strcpy(buf + m_strlen(buf), sizeof(buf) - m_strlen(buf), filepart);
         if (stat (buf, &st) != -1 && (st.st_mode & S_IFDIR))
-          strfcpy (filepart + mutt_strlen (filepart), "/",
-                   sizeof (filepart) - mutt_strlen (filepart));
+          m_strcpy(filepart + m_strlen(filepart),
+                   sizeof(filepart) - m_strlen(filepart), "/");
         init = 1;
       }
     }
@@ -223,14 +219,14 @@ int mutt_complete (char *s, size_t slen)
   closedir (dirp);
 
   if (dirpart[0]) {
-    strfcpy (s, dirpart, slen);
-    if (mutt_strcmp ("/", dirpart) != 0 && dirpart[0] != '='
+    m_strcpy(s, slen, dirpart);
+    if (m_strcmp("/", dirpart) != 0 && dirpart[0] != '='
         && dirpart[0] != '+')
-      strfcpy (s + mutt_strlen (s), "/", slen - mutt_strlen (s));
-    strfcpy (s + mutt_strlen (s), filepart, slen - mutt_strlen (s));
+      m_strcpy(s + m_strlen(s), slen - m_strlen(s), "/");
+    m_strcpy(s + m_strlen(s), slen - m_strlen(s), filepart);
   }
   else
-    strfcpy (s, filepart, slen);
+    m_strcpy(s, slen, filepart);
 
   return (init ? 0 : -1);
 }