context_replace.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 7db4e89..98b151a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -370,6 +370,7 @@ noinst_HEADERS = \
     sbr/context_del.h \
     sbr/context_find.h \
     sbr/context_read.h \
+    sbr/context_replace.h \
     sbr/ctype-checked.h \
     sbr/error.h \
     sbr/lock_file.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index dc4f597..784f740 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -31,7 +31,6 @@ int client(char *, char *, char *, int, int);
 void closefds(int);
 char *concat (const char *, ...) ENDNULL;
 int context_foil (char *);
-void context_replace (char *, char *);
 void context_save (void);
 char **copyip (char **, char **, int);
 void cpydata (int, int, const char *, const char *);

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index d5c2553..96ce05e 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_replace.h"
 #include "error.h"
 #include "h/utils.h"
 

diff --git a/sbr/context_replace.h b/sbr/context_replace.h
new file mode 100644 (file)
index 0000000..88c949f
--- /dev/null
+++ b/sbr/context_replace.h
@@ -0,0 +1,7 @@
+/* context_replace.h -- add/replace an entry in the context/profile list
+ *
+ * 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 context_replace(char *, char *);

diff --git a/sbr/seq_save.c b/sbr/seq_save.c
index 4731030..a5907c5 100644 (file)
--- a/sbr/seq_save.c
+++ b/sbr/seq_save.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "context_replace.h"
 #include "context_del.h"
 #include "seq_list.h"
 #include "error.h"

diff --git a/sbr/utils.c b/sbr/utils.c
index 673c4c4..98fcf24 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "context_replace.h"
 #include "context_read.h"
 #include "context_find.h"
 #include "print_help.h"

diff --git a/uip/anno.c b/uip/anno.c
index 1fd2f91..5f175e6 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/burst.c b/uip/burst.c
index d798369..46ac15d 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/dist.c b/uip/dist.c
index 1b5bca8..e7ea240 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/flist.c b/uip/flist.c
index 7819e1f..f3cd2a2 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 0d20e79..45f282c 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/folder.c b/uip/folder.c
index ef6bcf6..7db8fb0 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_del.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"

diff --git a/uip/forw.c b/uip/forw.c
index d8d181a..654a3f7 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"

diff --git a/uip/inc.c b/uip/inc.c
index 60a4fd6..0cbd08d 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 8fab5d8..5bbba21 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/mark.c b/uip/mark.c
index 719b534..201ad88 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 790d402..6004802 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/mhlist.c b/uip/mhlist.c
index aa9c3ae..b963639 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/mhn.c b/uip/mhn.c
index 0475876..3c14a99 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/mhshow.c b/uip/mhshow.c
index bad75b3..f1c37b0 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 628d059..ea5d457 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/new.c b/uip/new.c
index 66f2a61..2aca1b6 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/packf.c b/uip/packf.c
index 331c4bc..a33c866 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/pick.c b/uip/pick.c
index 2bd0d40..4dc7602 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/refile.c b/uip/refile.c
index 7d08195..660003e 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/repl.c b/uip/repl.c
index 488e607..777f578 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/rmf.c b/uip/rmf.c
index 3043d31..42869f9 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_del.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/rmm.c b/uip/rmm.c
index 872261e..334939c 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/scan.c b/uip/scan.c
index 63374d4..eb28f58 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/show.c b/uip/show.c
index 9aa7dd8..9d64709 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"

diff --git a/uip/sortm.c b/uip/sortm.c
index 8ba9f39..7dd7053 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"