escape_addresses.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index a351a3a96689978d8a53a68e8c5672076ad48eb7..90c3c25acca0319c62bd957bf8a130ad5a03427e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -375,6 +375,7 @@ noinst_HEADERS = \
     sbr/context_save.h \
     sbr/ctype-checked.h \
     sbr/error.h \
     sbr/context_save.h \
     sbr/ctype-checked.h \
     sbr/error.h \

+    sbr/escape_addresses.h \

     sbr/ext_hook.h \
     sbr/fdcompare.h \
     sbr/folder_addmsg.h \
     sbr/ext_hook.h \
     sbr/fdcompare.h \
     sbr/folder_addmsg.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index a91b620e7fa0c9cdbb956190699cf4700dd80187..465940a7a7e62c1cd131829f834aa6ffc342d091 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -70,9 +70,6 @@ int decode_qp(unsigned char byte1, unsigned char byte2) CONST;
 int encode_rfc2047(const char *name, char **value, int encoding,
                   const char *charset);
 
 int encode_rfc2047(const char *name, char **value, int encoding,
                   const char *charset);
 

-void escape_display_name (char *, size_t);
-void escape_local_part (char *, size_t);
-

 /*
  * Print null-terminated PROMPT to and flush standard output.  Read answers from
  * standard input until one matches an entry in SWITCHES.  When one matches,
 /*
  * Print null-terminated PROMPT to and flush standard output.  Read answers from
  * standard input until one matches an entry in SWITCHES.  When one matches,

diff --git a/sbr/escape_addresses.c b/sbr/escape_addresses.c
index 6463ec616e626ad5ade8311d66a8d3922d35765a..b963236453a23523c8c331229a6a1d2a8d43a711 100644 (file)
--- a/sbr/escape_addresses.c
+++ b/sbr/escape_addresses.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "escape_addresses.h"

 #include "h/utils.h"
 
 static void escape_component (char *name, size_t namesize, char *chars);
 #include "h/utils.h"
 
 static void escape_component (char *name, size_t namesize, char *chars);

diff --git a/sbr/escape_addresses.h b/sbr/escape_addresses.h
new file mode 100644 (file)
index 0000000..0302c2d
--- /dev/null
+++ b/sbr/escape_addresses.h
@@ -0,0 +1,8 @@
+/* escape_addresses.h -- Escape address components, hopefully per RFC 5322.
+ *
+ * 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. */
+
+void escape_display_name(char *, size_t);
+void escape_local_part(char *, size_t);

diff --git a/sbr/mts.c b/sbr/mts.c
index 639310b43338004c55e09cc1616a33580536651e..60e4c3c2996222c8ca86c37355ab31b3416ef9cd 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "escape_addresses.h"

 #include "context_find.h"
 #include "error.h"
 #include "h/utils.h"
 #include "context_find.h"
 #include "error.h"
 #include "h/utils.h"

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 4c795ac846d991d9cc647a9da6cadfa4d80ebdde..c3b19f4264423b52cc03dd85581715a42525e0db 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/escape_addresses.h"

 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"