Use good m_ functions, because it smell like a flower, version 2.

[apps/madmutt.git] / recvattach.c

diff --git a/recvattach.c b/recvattach.c
index 74a59fa..d4ebd3d 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -48,7 +48,7 @@ static struct mapping_t AttachHelp[] = {
   {NULL, OP_NULL}
 };
 
-static int mutt_extract_path (char *filename, char *path)
+static int mutt_extract_path (char *filename, char *path, ssize_t pathlen)
 {
   char *tmp = p_new(char, _POSIX_PATH_MAX);
   char *help_ptr;
@@ -59,7 +59,7 @@ static int mutt_extract_path (char *filename, char *path)
     if (*filename == '/') {
       *help_ptr++ = *filename++;
       *help_ptr++ = '\0';
-      strcat (path, tmp);
+      m_strcat(path, pathlen, tmp);
       help_ptr = tmp;
     }
     *help_ptr++ = *filename++;
@@ -424,7 +424,7 @@ static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
         return -1;
     }
     else {
-      mutt_extract_path (buf, path);
+      mutt_extract_path (buf, path, sizeof(path));
       m_strcpy(LastSaveFolder, sizeof(LastSaveFolder), path);
     }
 
@@ -776,12 +776,6 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr,
 {
   ATTACHPTR **idx = *idxp;
 
-#if 0
-  int old_optweed = option (OPTWEED);
-
-  set_option (OPTWEED);
-#endif
-
   do {
     switch (op) {
     case OP_DISPLAY_HEADERS:
@@ -837,10 +831,6 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr,
   }
   while (op != OP_NULL);
 
-#if 0
-  if (option (OPTWEED) != old_optweed)
-    toggle_option (OPTWEED);
-#endif
   return op;
 }