X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=d9b6d61058123c54a15f591562a6b67b81c72231;hp=ea535efff6ed28f43e0e51cd5156a1f2002e274a;hb=9eb3b25249e78d778b6d0583b06a7c5615709e63;hpb=0ac011f8eb41bab7808881ebf9802b4eb252fe3b

diff --git a/recvattach.c b/recvattach.c
index ea535ef..d9b6d61 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -21,17 +21,18 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
-#include "enter.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
 #include "rfc1524.h"
 #include "attach.h"
 #include "mx.h"
 #include "copy.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 
 #include <ctype.h>
@@ -91,7 +92,7 @@ void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
 
   for (x = 0; x < idxlen; x++) {
     idx[x]->num = x;
-    if (2 * (idx[x]->level + 2) < sizeof (buf)) {
+    if (2 * (idx[x]->level + 2) < ssizeof (buf)) {
       if (idx[x]->level) {
         s = buf + 2 * (idx[x]->level - 1);
         *s++ = (idx[x]->content->next) ? M_TREE_LTEE : M_TREE_LLCORNER;
@@ -110,7 +111,7 @@ void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
     else
       idx[x]->tree = m_strdup(buf);
 
-    if (2 * (idx[x]->level + 2) < sizeof (buf) && idx[x]->level) {
+    if (2 * (idx[x]->level + 2) < ssizeof (buf) && idx[x]->level) {
       s = buf + 2 * (idx[x]->level - 1);
       *s++ = (idx[x]->content->next) ? '\005' : '\006';
       *s++ = '\006';
@@ -187,7 +188,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
  * %u = unlink 
  */
 const char *mutt_attach_fmt (char *dest,
-                             size_t destlen,
+                             ssize_t destlen,
                              char op,
                              const char *src,
                              const char *prefix,
@@ -200,7 +201,7 @@ const char *mutt_attach_fmt (char *dest,
   char charset[SHORT_STRING];
   ATTACHPTR *aptr = (ATTACHPTR *) data;
   int optional = (flags & M_FORMAT_OPTIONAL);
-  size_t l;
+  ssize_t l;
 
   switch (op) {
   case 'C':
@@ -367,7 +368,7 @@ const char *mutt_attach_fmt (char *dest,
   return (src);
 }
 
-static void attach_entry (char *b, size_t blen, MUTTMENU * menu, int num)
+static void attach_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
 {
   int w=(COLS-SW)>blen?blen:(COLS-SW);
   mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt,
@@ -564,12 +565,12 @@ void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr,
 }
 
 static void
-mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter)
+mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int afilter)
 {
   char tfile[_POSIX_PATH_MAX];
   char warning[STRING + _POSIX_PATH_MAX];
 
-  if (filter) {
+  if (afilter) {
     snprintf (warning, sizeof (warning),
               _("WARNING!  You are about to overwrite %s, continue?"),
               body->filename);
@@ -583,7 +584,7 @@ mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter)
     tfile[0] = 0;
 
   if (mutt_pipe_attachment (fp, body, command, tfile)) {
-    if (filter) {
+    if (afilter) {
       mutt_unlink (body->filename);
       mutt_rename_file (tfile, body->filename);
       mutt_update_encoding (body);
@@ -591,7 +592,7 @@ mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter)
     }
   }
   else {
-    if (filter && tfile[0])
+    if (afilter && tfile[0])
       mutt_unlink (tfile);
   }
 }
@@ -620,50 +621,50 @@ static void pipe_attachment (FILE * fp, BODY * b, STATE * state)
 
 static void
 pipe_attachment_list (char *command, FILE * fp, int tag, BODY * top,
-                      int filter, STATE * state)
+                      int afilter, STATE * state)
 {
   for (; top; top = top->next) {
     if (!tag || top->tagged) {
-      if (!filter && !option (OPTATTACHSPLIT))
+      if (!afilter && !option (OPTATTACHSPLIT))
         pipe_attachment (fp, top, state);
       else
-        mutt_query_pipe_attachment (command, fp, top, filter);
+        mutt_query_pipe_attachment (command, fp, top, afilter);
     }
     else if (top->parts)
-      pipe_attachment_list (command, fp, tag, top->parts, filter, state);
+      pipe_attachment_list (command, fp, tag, top->parts, afilter, state);
     if (!tag)
       break;
   }
 }
 
-void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int filter)
+void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int afilter)
 {
   STATE state;
   char buf[SHORT_STRING];
   pid_t thepid;
 
   if (fp)
-    filter = 0;                 /* sanity check: we can't filter in the recv case yet */
+    afilter = 0;                 /* sanity check: we can't filter in the recv case yet */
 
   buf[0] = 0;
   p_clear(&state, 1);
 
-  if (mutt_get_field ((filter ? _("Filter through: ") : _("Pipe to: ")),
+  if (mutt_get_field ((afilter ? _("Filter through: ") : _("Pipe to: ")),
                       buf, sizeof (buf), M_CMD) != 0 || !buf[0])
     return;
 
   mutt_expand_path (buf, sizeof (buf));
 
-  if (!filter && !option (OPTATTACHSPLIT)) {
+  if (!afilter && !option (OPTATTACHSPLIT)) {
     mutt_endwin (NULL);
     thepid = mutt_create_filter (buf, &state.fpout, NULL, NULL);
-    pipe_attachment_list (buf, fp, tag, top, filter, &state);
+    pipe_attachment_list (buf, fp, tag, top, afilter, &state);
     fclose (state.fpout);
     if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
       mutt_any_key_to_continue (NULL);
   }
   else
-    pipe_attachment_list (buf, fp, tag, top, filter, &state);
+    pipe_attachment_list (buf, fp, tag, top, afilter, &state);
 }
 
 static int can_print (BODY * top, int tag)