fmt_rfc2047.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 3d1353b4e0ad024758d0bae9b63f8bf76721e927..2797949a7f92e77b14e9b22b087192d12d8b80d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -385,6 +385,7 @@ noinst_HEADERS = \
     sbr/escape_addresses.h \
     sbr/ext_hook.h \
     sbr/fdcompare.h \
     sbr/escape_addresses.h \
     sbr/ext_hook.h \
     sbr/fdcompare.h \

+    sbr/fmt_rfc2047.h \

     sbr/folder_addmsg.h \
     sbr/folder_delmsgs.h \
     sbr/folder_free.h \
     sbr/folder_addmsg.h \
     sbr/folder_delmsgs.h \
     sbr/folder_free.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 5f8f8e0dfdf0b50b74c21b9024fddabf1f9c65d6..dfc4e51590f8ccb7023c1dffdcf3442ea7c0c5ae 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -16,19 +16,6 @@ char *etcpath(char *) NONNULL(1);
 struct msgs_array;
 
 char *concat (const char *, ...) ENDNULL;
 struct msgs_array;
 
 char *concat (const char *, ...) ENDNULL;

-int decode_rfc2047 (char *, char *, size_t);
-
-/*
- * Decode two characters into their quoted-printable representation.
- *
- * Arguments are:
- *
- * byte1       - First character of Q-P representation
- * byte2       - Second character of Q-P representation
- *
- * Returns the decoded value, -1 if the conversion failed.
- */
-int decode_qp(unsigned char byte1, unsigned char byte2) CONST;

 
 /*
  * Encode a message header using RFC 2047 encoding.  If the message contains
 
 /*
  * Encode a message header using RFC 2047 encoding.  If the message contains

diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index 660938980d04010de2f215e6f2b6d782885f03cf..2fe63e5652d6eecf2471717b0310f0a90eb68891 100644 (file)
--- a/sbr/fmt_rfc2047.c
+++ b/sbr/fmt_rfc2047.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "fmt_rfc2047.h"

 #include "check_charset.h"
 #include "h/utils.h"
 #ifdef HAVE_ICONV
 #include "check_charset.h"
 #include "h/utils.h"
 #ifdef HAVE_ICONV

diff --git a/sbr/fmt_rfc2047.h b/sbr/fmt_rfc2047.h
new file mode 100644 (file)
index 0000000..8b6ec09
--- /dev/null
+++ b/sbr/fmt_rfc2047.h
@@ -0,0 +1,19 @@
+/* fmt_rfc2047.h -- decode RFC-2047 header format 
+ *
+ * This code is Copyright (c) 2017, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information. */
+
+/*
+ * Decode two characters into their quoted-printable representation.
+ *
+ * Arguments are:
+ *
+ * byte1       - First character of Q-P representation
+ * byte2       - Second character of Q-P representation
+ *
+ * Returns the decoded value, -1 if the conversion failed.
+ */
+int decode_qp(unsigned char byte1, unsigned char byte2) CONST;
+
+int decode_rfc2047(char *, char *, size_t);

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 74000876e86ae5f26a47534864bf3088a01c00bd..3c4c8d777b203f3ca6b7d711515a5f8b585297fa 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -9,6 +9,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "fmt_rfc2047.h"

 #include "uprf.h"
 #include "context_find.h"
 #include "error.h"
 #include "uprf.h"
 #include "context_find.h"
 #include "error.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 68c1bf716ffaedc25b4a02419ccb0311847fb19c..dd0d8a232d000809e5a5e01e8f85502695f03e0c 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/fmt_rfc2047.h"

 #include "sbr/cpydata.h"
 #include "sbr/trimcpy.h"
 #include "sbr/m_convert.h"
 #include "sbr/cpydata.h"
 #include "sbr/trimcpy.h"
 #include "sbr/m_convert.h"

diff --git a/uip/mhparse.c b/uip/mhparse.c
index d4a239cbbfc0f8540475186ef25b9a2eee80835f..110ed4e750ab55412312c8eacb2e11db9fd6e408 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/fmt_rfc2047.h"

 #include "sbr/uprf.h"
 #include "sbr/check_charset.h"
 #include "sbr/getcpy.h"
 #include "sbr/uprf.h"
 #include "sbr/check_charset.h"
 #include "sbr/getcpy.h"

diff --git a/uip/picksbr.c b/uip/picksbr.c
index 346dcc7031063426aac22b27420d854659ffd874..aff2fea77ef9953d79f1606afcfa1fe063125537 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/fmt_rfc2047.h"

 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/error.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/error.h"