X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=97e650f2cec08badd39eca09d81eabce45197ecc;hp=81a0788ad6c25645754361f02c1be79aaef4c408;hb=9874228a8377de76c39f2eeb208d742fd4772ae5;hpb=c8b8b9539aaf11b48c4c1e5baba434db09722111

diff --git a/muttlib.c b/muttlib.c
index 81a0788..97e650f 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -40,34 +40,15 @@
  */
 void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
 {
-  char buf[_POSIX_PATH_MAX];
-  char tmp[_POSIX_PATH_MAX];
-  char *period;
-  ssize_t sl;
-  struct stat sb;
-
-  m_strcpy(buf, sizeof(buf), m_strisempty(dir) ? NONULL(Tempdir) : dir);
-  mutt_expand_path (buf, sizeof (buf));
-  if (s[0] == '\0') {
-    snprintf (s, l, "%s/muttXXXXXX", buf);
-    mktemp (s);
-  }
-  else {
-    m_strcpy(tmp, sizeof(tmp), s);
-    mutt_sanitize_filename (tmp, 1);
-    snprintf (s, l, "%s/%s", buf, tmp);
-    if (lstat (s, &sb) == -1 && errno == ENOENT)
-      return;
-    if ((period = strrchr (tmp, '.')) != NULL)
-      *period = 0;
-    snprintf (s, l, "%s/%s.XXXXXX", buf, tmp);
-    mktemp (s);
-    if (period != NULL) {
-      *period = '.';
-      sl = m_strlen(s);
-      m_strcpy(s + sl, l - sl, period);
+    int fd;
+
+    fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(Tempdir) : dir, s);
+    if (fd < 0) {
+        *s = '\0';
+    } else {
+        close(fd);
+        unlink(s);
     }
-  }
 }
 
 /* returns true if the header contained in "s" is in list "t" */
@@ -190,13 +171,15 @@ ssize_t _mutt_expand_path(char *s, ssize_t slen, int rx)
     return m_strcpy(s, slen, tmp);
 }
 
-void mutt_mktemp (char *s)
+void mutt_mktemp(char *s)
 {
-
-  snprintf (s, _POSIX_PATH_MAX, "%s/madmutt-%s-%d-%d-%d-%x%x", NONULL (Tempdir),
-            NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++, 
-            (unsigned int) rand(), (unsigned int) rand());
-  unlink (s);
+    int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(Tempdir), NULL);
+    if (fd < 0) {
+        *s = '\0';
+    } else {
+        close(fd);
+        unlink(s);
+    }
 }
 
 /* collapse the pathname using ~ or = when possible */
@@ -250,13 +233,12 @@ void mutt_pretty_mailbox (char *s)
   }
 }
 
-void mutt_expand_file_fmt(char *dest, ssize_t destlen,
-                          const char *fmt, const char *src)
+void
+mutt_expand_file_fmt(char *dst, ssize_t n, const char *fmt, const char *src)
 {
     char tmp[LONG_STRING];
-
     mutt_quote_filename(tmp, sizeof(tmp), src);
-    m_snsubst(dest, destlen, fmt, tmp);
+    m_file_fmt(dst, n, fmt, tmp);
 }
 
 /* return 0 on success, -1 on abort, 1 on error */
@@ -293,9 +275,8 @@ int mutt_check_overwrite (const char *attname, const char *path,
       }
     }
     else
-      if ((rc =
-           mutt_yesorno (_("File is a directory, save under it?"),
-                         M_YES)) != M_YES)
+      if ((rc = mutt_yesorno(_("File is a directory, save under it?"),
+                             M_YES)) != M_YES)
       return (rc == M_NO) ? 1 : -1;
 
     if (!attname || !attname[0]) {
@@ -559,16 +540,6 @@ void mutt_FormatString (char *dest,     /* output buffer */
     }
   }
   *wptr = 0;
-
-#if 0
-  if (flags & M_FORMAT_MAKEPRINT) {
-    /* Make sure that the string is printable by changing all non-printable
-       chars to dots, or spaces for non-printable whitespace */
-    for (cp = dest; *cp; cp++)
-      if (!isprint(*cp) && !((flags & M_FORMAT_TREE) && (*cp <= M_TREE_MAX)))
-        *cp = isspace ((unsigned char) *cp) ? ' ' : '.';
-  }
-#endif
 }
 
 /* returns 0 if OK to proceed, -1 to abort, 1 to retry */
@@ -612,8 +583,7 @@ int mutt_save_confirm (const char *s, struct stat *st)
       mutt_error (_("%s is not a mailbox!"), s);
       return 1;
     }
-  }
-  else {
+  } else {
     if (magic != M_IMAP)
     {
       st->st_mtime = 0;
@@ -627,8 +597,7 @@ int mutt_save_confirm (const char *s, struct stat *st)
           else if (rc == -1)
             ret = -1;
         }
-      }
-      else {
+      } else {
         mutt_perror (s);
         return 1;
       }
@@ -681,22 +650,7 @@ const char *mutt_make_version (int full)
   return vstring;
 }
 
-void mutt_free_spam_list (SPAM_LIST ** list)
-{
-  SPAM_LIST *p;
-
-  if (!list)
-    return;
-  while (*list) {
-    p = *list;
-    *list = (*list)->next;
-    rx_delete(&p->rx);
-    p_delete(&p->template);
-    p_delete(&p);
-  }
-}
-
-int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x)
+int mutt_match_spam_list (const char *s, rx_t * l, char *text, int x)
 {
   static regmatch_t *pmatch = NULL;
   static int nmatch = 0;
@@ -716,8 +670,7 @@ int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x)
     }
 
     /* Does this pattern match? */
-    if (regexec(l->rx->rx, s, l->nmatch, (regmatch_t *)pmatch, (int) 0) == 0)
-    {
+    if (regexec(l->rx, s, l->nmatch, (regmatch_t *)pmatch, (int) 0) == 0) {
       /* Copy template into text, with substitutions. */
       for (p = l->template; *p;) {
         if (*p == '%') {
@@ -951,7 +904,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
             /* read line */
             p_clear(&expn, 1);
             expn.data = mutt_read_line(NULL, &expn.dsize, fp, &line);
-            fclose(fp);
+            m_fclose(&fp);
             mutt_wait_filter(pid);
 
             /* if we got output, make a new string consiting of the shell ouptput