X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=c87f9cf30579b236b33cbe9bc6a4d313b7245e2f;hp=57d4bb35bbbd28cb61764120743b1aa671fe404e;hb=a8477ebaa09990b3688164cbe5cf661c4189541d;hpb=25bf57d598476b329536fa3f748cc0c529fef6bd

diff --git a/attach.c b/attach.c
index 57d4bb3..c87f9cf 100644
--- a/attach.c
+++ b/attach.c
@@ -26,6 +26,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -97,8 +98,7 @@ int mutt_compose_attachment (BODY * a)
         strfcpy (command, entry->composecommand, sizeof (command));
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {
-        dprint (1, (debugfile, "oldfile: %s\t newfile: %s\n",
-                    a->filename, newfile));
+        debug_print (1, ("oldfile: %s\t newfile: %s\n", a->filename, newfile));
         if (safe_symlink (a->filename, newfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
               != M_YES)
@@ -219,8 +219,7 @@ int mutt_edit_attachment (BODY * a)
       strfcpy (command, entry->editcommand, sizeof (command));
       if (rfc1524_expand_filename (entry->nametemplate,
                                    a->filename, newfile, sizeof (newfile))) {
-        dprint (1, (debugfile, "oldfile: %s\t newfile: %s\n",
-                    a->filename, newfile));
+        debug_print (1, ("oldfile: %s\t newfile: %s\n", a->filename, newfile));
         if (safe_symlink (a->filename, newfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
               != M_YES)
@@ -273,7 +272,7 @@ static int is_mmnoask (const char *buf)
   int lng;
 
   if ((p = getenv ("MM_NOASK")) != NULL && *p) {
-    if (safe_strcmp (p, "1") == 0)
+    if (str_cmp (p, "1") == 0)
       return (1);
 
     strfcpy (tmp, p, sizeof (tmp));
@@ -291,8 +290,8 @@ static int is_mmnoask (const char *buf)
         }
       }
       else {
-        lng = safe_strlen (p);
-        if (buf[lng] == '/' && safe_strncasecmp (buf, p, lng) == 0)
+        lng = str_len (p);
+        if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)
           return (1);
       }
 
@@ -309,7 +308,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
   int i;
 
   for (; t; t = t->next) {
-    i = safe_strlen (t->data) - 1;
+    i = str_len (t->data) - 1;
     if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0) {
@@ -327,8 +326,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
                   n == TYPEMULTIPART ? "multipart" :
                   n == TYPETEXT ? "text" :
                   n == TYPEVIDEO ? "video" : "other", tmp.subtype);
-        dprint (1, (debugfile, "mutt_check_lookup_list: \"%s\" -> %s\n",
-                    b->filename, type));
+        debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
       }
       if (tmp.subtype)
         FREE (&tmp.subtype);
@@ -361,7 +359,7 @@ int mutt_is_autoview (BODY * b, const char *type)
   }
 
   for (; t; t = t->next) {
-    i = safe_strlen (t->data) - 1;
+    i = str_len (t->data) - 1;
     if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0)
@@ -422,7 +420,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
     strfcpy (command, entry->command, sizeof (command));
 
     if (fp) {
-      fname = safe_strdup (a->filename);
+      fname = str_dup (a->filename);
       mutt_sanitize_filename (fname, 1);
     }
     else
@@ -430,7 +428,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
     if (rfc1524_expand_filename (entry->nametemplate, fname,
                                  tempfile, sizeof (tempfile))) {
-      if (fp == NULL && safe_strcmp (tempfile, a->filename)) {
+      if (fp == NULL && str_cmp (tempfile, a->filename)) {
         /* send case: the file is already there */
         if (safe_symlink (a->filename, tempfile) == -1) {
           if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
@@ -891,7 +889,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     rfc1524_entry *entry;
     int piped = FALSE;
 
-    dprint (2, (debugfile, "Using mailcap...\n"));
+    debug_print (2, ("Using mailcap...\n"));
 
     entry = rfc1524_new_entry ();
     rfc1524_mailcap_lookup (a, type, entry, M_PRINT);
@@ -971,8 +969,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     mutt_mktemp (newfile);
     if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) {
 
-      dprint (2,
-              (debugfile, "successfully decoded %s type attachment to %s\n",
+      debug_print (2, ("successfully decoded %s type attachment to %s\n",
                type, newfile));
 
       if ((ifp = fopen (newfile, "r")) == NULL) {
@@ -980,7 +977,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
         goto bail0;
       }
 
-      dprint (2, (debugfile, "successfully opened %s read-only\n", newfile));
+      debug_print (2, ("successfully opened %s read-only\n", newfile));
 
       mutt_endwin (NULL);
       if ((thepid =
@@ -990,7 +987,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
         goto bail0;
       }
 
-      dprint (2, (debugfile, "Filter created.\n"));
+      debug_print (2, ("Filter created.\n"));
 
       mutt_copy_stream (ifp, fpout);