uprf.c: Move interface to own file.

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

+    sbr/uprf.h \

     sbr/vector.h \
     sbr/vfgets.h \
     thirdparty/jsmn/jsmn.h \
     sbr/vector.h \
     sbr/vfgets.h \
     thirdparty/jsmn/jsmn.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index b762216..08c88a5 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -190,8 +190,6 @@ int ssequal (const char *, const char *) PURE;
 int stringdex (char *, char *) PURE;
 char *trimcpy (char *);
 
 int stringdex (char *, char *) PURE;
 char *trimcpy (char *);
 

-int uprf (const char *, const char *) PURE;
-

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

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 62abfb9..669572a 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "uprf.h"

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

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 1d8dd29..7400087 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 "uprf.h"

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

diff --git a/sbr/strindex.c b/sbr/strindex.c
index c92da6e..8eaf6c2 100644 (file)
--- a/sbr/strindex.c
+++ b/sbr/strindex.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "uprf.h"

 
 int
 stringdex (char *p1, char *p2)
 
 int
 stringdex (char *p1, char *p2)

diff --git a/sbr/uprf.c b/sbr/uprf.c
index bcd4c13..9d9927f 100644 (file)
--- a/sbr/uprf.c
+++ b/sbr/uprf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "uprf.h"

 
 
 /* uprf returns true if s starts with prefix, ignoring case.
 
 
 /* uprf returns true if s starts with prefix, ignoring case.

diff --git a/sbr/uprf.h b/sbr/uprf.h
new file mode 100644 (file)
index 0000000..3bbb9c8
--- /dev/null
+++ b/sbr/uprf.h
@@ -0,0 +1,7 @@
+/* uprf.h -- "unsigned" lexical prefix
+ *
+ * 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. */
+
+int uprf(const char *, const char *) PURE;

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 096bf97..f48fbbe 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/uprf.h"

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

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

+#include "sbr/uprf.h"

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

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

+#include "sbr/uprf.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/mhstoresbr.c b/uip/mhstoresbr.c
index a48d4b6..c93a1df 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/uprf.h"

 #include "sbr/getcpy.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/getcpy.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"

diff --git a/uip/post.c b/uip/post.c
index 67ab820..80802fb 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/uprf.h"

 #include "sbr/context_foil.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"
 #include "sbr/context_foil.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"

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

+#include "sbr/uprf.h"

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

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

+#include "sbr/uprf.h"

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

diff --git a/uip/show.c b/uip/show.c
index b3c8303..3e708df 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/uprf.h"

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

diff --git a/uip/sortm.c b/uip/sortm.c
index 709fc6d..a9ce985 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/uprf.h"

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