move some files around.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/Makefile.am b/Makefile.am
index 7b1775c..37aa605 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,7 @@ madmutt_SOURCES = $(BUILT_SOURCES) \
        compose.c copy.c editmsg.c init.c keymap.c lib.c \
        flags.c filter.c from.c handler.c hcache.c hdrline.c headers.c help.c hook.c \
        main.c mbox.c mh.c muttlib.c mutt_idna.c mx.c \
-       pager.c pattern.c postpone.c query.c \
-       recvattach.c recvcmd.c rfc3676.c \
+       pager.c pattern.c postpone.c query.c recvattach.c recvcmd.c \
        score.c send.c sendlib.c sidebar.c sort.c state.c status.c \
        thread.c account.c
 
@@ -66,16 +65,12 @@ EXTRA_madmutt_SOURCES = \
 
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        configure account.h alias.h attach.h recvattach.h handler.h thread.h \
-       buffy.h charset.h compress.h copy.h \
-       dotlock.h functions.def gen_defs \
-       recvattach.h handler.h thread.h \
-       globals.h init.h keymap.h mutt_crypt.h \
+       buffy.h charset.h compress.h copy.h dotlock.h functions.def gen_defs \
+       recvattach.h handler.h thread.h globals.h init.h keymap.h \
        mime.h mutt.h mutt_sasl.h mbox.h mh.h mx.h pager.h protos.h \
-       rfc3676.h sort.h mime.types autogen.sh \
-       OPS.MIX remailer.c remailer.h browser.h state.h \
-       lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h madmuttrc.head madmuttrc \
-       makedoc.c stamp-doc-rc README.SSL smime.h\
-       depcomp mutt_idna.h mutt_libesmtp.h
+       sort.h mime.types autogen.sh OPS.MIX remailer.c remailer.h browser.h state.h \
+       lib.h extlib.c pgpewrap.c smime_keys.pl Madmuttrc.head Madmuttrc \
+       makedoc.c stamp-doc-rc README.SSL depcomp mutt_idna.h mutt_libesmtp.h
 
 madmutt_dotlock_SOURCES = dotlock.c
 madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@

diff --git a/handler.c b/handler.c
index fc80372..fe2a0f7 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -25,13 +25,13 @@
 #include <lib-lib/file.h>
 
 #include <lib-mime/mime.h>
+#include <lib-mime/rfc3676.h>
 
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "recvattach.h"
 #include "handler.h"
-#include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"
 #include "charset.h"
@@ -270,7 +270,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
     else
       bufi[l++] = ch;
 
-    if (l + 8 >= sizeof (bufi))
+    if (l + 8 >= ssizeof (bufi))
       mutt_convert_to_state (cd, bufi, &l, s);
   }
 

diff --git a/lib-mime/Makefile.am b/lib-mime/Makefile.am
index c332223..f8ecd2d 100644 (file)
--- a/lib-mime/Makefile.am
+++ b/lib-mime/Makefile.am
@@ -4,7 +4,9 @@ DISTCLEANFILES    = $(BUILT_SOURCES)
 noinst_LIBRARIES = libmime.a
 
 libmime_a_SOURCES = mime.h mime-types.h $(BUILT_SOURCES) \
-                   mime.c rfc822address.c rfc822parse.c rfc1524.c rfc2047.c rfc2231.c
+                   mime.c rfc822address.c rfc822parse.c rfc1524.c rfc2047.c rfc2231.c \
+                   \
+                   rfc3676.h rfc3676.c
 
 noinst_HEADERS    = mime.h mime-types.h
 

diff --git a/rfc3676.c b/lib-mime/rfc3676.c
similarity index 100%
rename from rfc3676.c
rename to lib-mime/rfc3676.c

diff --git a/rfc3676.h b/lib-mime/rfc3676.h
similarity index 96%
rename from rfc3676.h
rename to lib-mime/rfc3676.h
index 3ec6fdd..7f4e475 100644 (file)
--- a/rfc3676.h
+++ b/lib-mime/rfc3676.h
@@ -11,7 +11,7 @@
 #ifndef _MUTT_RFC3676_H
 #define _MUTT_RFC3676_H
 
-#include "mutt.h"
+#include <lib-mime/mime.h>
 #include "state.h"
 
 /* body handler implementing RfC 3676 for format=flowed */

diff --git a/send.c b/send.c
index 9d85a9e..9de2548 100644 (file)
--- a/send.c
+++ b/send.c
@@ -31,13 +31,13 @@
 #include <lib-lib/url.h>
 
 #include <lib-mime/mime.h>
+#include <lib-mime/rfc3676.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 
 #include "mutt.h"
 #include "alias.h"
-#include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"
 #include "mx.h"

diff --git a/state.c b/state.c
index 12f3e99..86a75f5 100644 (file)
--- a/state.c
+++ b/state.c
@@ -14,9 +14,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#include <lib-mime/rfc3676.h>
+
 #include "mutt.h"
 #include "state.h"
-#include "rfc3676.h"
 
 static void state_prefix_put (const char *d, ssize_t dlen, STATE * s)
 {