trimcpy.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 91fe095..cdad315 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -416,6 +416,7 @@ noinst_HEADERS = \
     sbr/seq_nameok.h \
     sbr/seq_print.h \
     sbr/terminal.h \
     sbr/seq_nameok.h \
     sbr/seq_print.h \
     sbr/terminal.h \

+    sbr/trimcpy.h \

     sbr/unquote.h \
     sbr/uprf.h \
     sbr/vector.h \
     sbr/unquote.h \
     sbr/uprf.h \
     sbr/vector.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 08c88a5..cebd1b6 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -21,8 +21,6 @@ char *concat (const char *, ...) ENDNULL;
 char **copyip (char **, char **, int);
 void cpydata (int, int, const char *, const char *);
 void cpydgst (int, int, char *, char *);
 char **copyip (char **, char **, int);
 void cpydata (int, int, const char *, const char *);
 void cpydgst (int, int, char *, char *);

-char *cpytrim (const char *);
-char *rtrim (char *);

 int decode_rfc2047 (char *, char *, size_t);
 void discard (FILE *);
 
 int decode_rfc2047 (char *, char *, size_t);
 void discard (FILE *);
 


@@ -188,7 +186,6 @@ int smatch(const char *, const struct swit *) PURE;
 char *snprintb (char *buffer, size_t size, unsigned flags, char *bitfield);
 int ssequal (const char *, const char *) PURE;
 int stringdex (char *, char *) PURE;
 char *snprintb (char *buffer, size_t size, unsigned flags, char *bitfield);
 int ssequal (const char *, const char *) PURE;
 int stringdex (char *, char *) PURE;

-char *trimcpy (char *);

 
 /*
  * prototypes for some routines in uip
 
 /*
  * prototypes for some routines in uip

diff --git a/sbr/oauth.c b/sbr/oauth.c
index 8061c28..195b9b8 100755 (executable)
--- a/sbr/oauth.c
+++ b/sbr/oauth.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "trimcpy.h"

 #include "getcpy.h"
 #include "error.h"
 
 #include "getcpy.h"
 #include "error.h"
 

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 2df4c8e..0df1b57 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "trimcpy.h"

 #include "getcpy.h"
 #include "readconfig.h"
 #include "error.h"
 #include "getcpy.h"
 #include "readconfig.h"
 #include "error.h"

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 1670aac..c004335 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "trimcpy.h"

 #include "getcpy.h"
 #include "m_atoi.h"
 #include "brkstring.h"
 #include "getcpy.h"
 #include "m_atoi.h"
 #include "brkstring.h"

diff --git a/sbr/trimcpy.c b/sbr/trimcpy.c
index 6ed00b9..09b6ec3 100644 (file)
--- a/sbr/trimcpy.c
+++ b/sbr/trimcpy.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "trimcpy.h"

 #include "h/utils.h"
 
 
 #include "h/utils.h"
 
 

diff --git a/sbr/trimcpy.h b/sbr/trimcpy.h
new file mode 100644 (file)
index 0000000..ae92368
--- /dev/null
+++ b/sbr/trimcpy.h
@@ -0,0 +1,11 @@
+/* trimcpy.h -- strip leading and trailing whitespace,
+ *           -- replace internal whitespace with spaces,
+ *           -- then return a copy.
+ *
+ * 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. */
+
+char *trimcpy(char *);
+char *cpytrim(const char *);
+char *rtrim(char *);

diff --git a/uip/anno.c b/uip/anno.c
index 59a5b99..7ce3dbc 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/trimcpy.h"

 #include "sbr/m_draft.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/m_draft.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 0a5ba67..f77eeb1 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/trimcpy.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/mhcachesbr.c b/uip/mhcachesbr.c
index 453c356..9fedd16 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/trimcpy.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/md5.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/md5.h"

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

+#include "sbr/trimcpy.h"

 #include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/getfolder.h"
 #include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/getfolder.h"

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

+#include "sbr/trimcpy.h"

 #include <fcntl.h>
 #include "h/mts.h"
 #include "h/tws.h"
 #include <fcntl.h>
 #include "h/mts.h"
 #include "h/tws.h"

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 56875e3..013b27a 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/trimcpy.h"

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

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 0f2b9eb..a69dade 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/trimcpy.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/utils.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/utils.h"

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 59f6f43..2bac9d0 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/trimcpy.h"

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

diff --git a/uip/new.c b/uip/new.c
index 4fdbeea..18e60ff 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include "h/mh.h"
 #include <sys/types.h>
 
 #include "h/mh.h"

+#include "sbr/trimcpy.h"

 #include "sbr/vfgets.h"
 #include "sbr/getcpy.h"
 #include "sbr/m_atoi.h"
 #include "sbr/vfgets.h"
 #include "sbr/getcpy.h"
 #include "sbr/m_atoi.h"

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index fa70c34..0e773e7 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/trimcpy.h"

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

diff --git a/uip/slocal.c b/uip/slocal.c
index 6cace00..52fae74 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -20,6 +20,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/trimcpy.h"

 #include "sbr/getcpy.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/getcpy.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"