context_replace.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 7db4e89b593b0b63d0eb86b25bb881571aa00ba3..98b151a3249f28f638b43c87737f02fdbff5a5ee 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_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 \
     sbr/ctype-checked.h \
     sbr/error.h \
     sbr/lock_file.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index dc4f59794f61c53644cc9c14ae06ab8a49ab814c..784f74091689067c2e39fd8230a9c213a45d8636 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 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 *);
 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 d5c255318a88edfa1d045e870b53d40bc344f314..96ce05e91120e267da649b910cf0561800f297c2 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "context_replace.h"

 #include "error.h"
 #include "h/utils.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 4731030bd4a82939662b79e94d7ffbca89ab0724..a5907c59b14907d9c6c4c28e5d090fd4efbabfa7 100644 (file)
--- a/sbr/seq_save.c
+++ b/sbr/seq_save.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "context_replace.h"

 #include "context_del.h"
 #include "seq_list.h"
 #include "error.h"
 #include "context_del.h"
 #include "seq_list.h"
 #include "error.h"

diff --git a/sbr/utils.c b/sbr/utils.c
index 673c4c431d014120ef1589612a0d1f7d701069e8..98fcf24c2bbba120de8b0e46862e6be790a816b8 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "context_replace.h"

 #include "context_read.h"
 #include "context_find.h"
 #include "print_help.h"
 #include "context_read.h"
 #include "context_find.h"
 #include "print_help.h"

diff --git a/uip/anno.c b/uip/anno.c
index 1fd2f918713f4fa512759fb19ddd086ec4f32aba..5f175e6b9c5b1e42d4b62cae0326a1ec2cc13603 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 d7983697d053a365ee66bd687c56f7ed26e1954c..46ac15d48c60855b9a00665a813c8fdc21ceaeb5 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 1b5bca89ec39008c68babb57befea71ee88936bd..e7ea240e2d39b8e1bbdb2a8c90c41181f8669972 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 7819e1f3b67652886db38854b7354a3840f485da..f3cd2a27fd77ca332ba9677479629abe2597c6a4 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.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 0d20e79a7204ed8d81cfb8fcc3fce04206365d1f..45f282cdc59aa03d00989f787d254e55eba3a51b 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.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 ef6bcf6542d222ccca4ee05fbc4f2ad141bd0c92..7db8fb05bb6d9343a038a6d300c414da501b0e5c 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_del.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.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 d8d181afc8670835586cb2e38b5ac2ce00f262b2..654a3f74456410b7f6314aadec8af60690572848 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.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 60a4fd64f79fc491ea8413e96be0a6401ad8d0ec..0cbd08d8f792ccfb25e6902e1e9a4c2f18e08c61 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
 #endif
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 8fab5d86babc390ef783187f7ebbdadb6dad31e1..5bbba219b5cf0e46ca40a25c4152e29cd95c52f1 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

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

diff --git a/uip/mark.c b/uip/mark.c
index 719b534e2f5d946e2780244d8c09b5f7b2877afd..201ad88f032c69003af4559f719b8b2ff692c814 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 790d402a62c58fe2c20410502228541c05194fc7..60048024c8853a2dd972e650da0737623a628ce0 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.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 aa9c3aeef2a81fb83afde506cce07c83329538eb..b9636393eb94ac88dc1985f6195bd8cbc1484097 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 0475876a952da1c433cc4402065ce575dd50f126..3c14a9935d9bf12989573c59f3e3e86bfa073cb1 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.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 bad75b36fe30ec5994637bf86b6dfa89009c5c31..f1c37b01abc27da11f9ea1158218cd2feba471e7 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.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 628d059ff30d055c39da79010dd5a66610887f8a..ea5d457061b5ea8fa46845f40a751ad5ea5980fc 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/ambigsw.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 66f2a617c8a81d96e130c4c2a02acf970bf29ae7..2aca1b6db713498ddeda5137a339a63f632ab783 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/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.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 331c4bc0e9e48e1a3111e92951eee6ddfb59bb4f..a33c86631400e115f5cf881a1e5d78f91d7c36b6 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 2bd0d4007d4ead53928d6e57d3e3709cfe8f590b..4dc7602d2ddc25c4a4627b5eb8a440907f2899a4 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 7d08195b337b144c9aff10d1ab2ae081323a323d..660003e07387423e0c42c963b990518abc780363 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 488e60788b24d8ff86d98a90af6ae19c1ab97cd4..777f5784f2edd69843a5b92fb97ba71a2f9a7fc3 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 3043d316548c076802536749fccbfc3724a17b0a..42869f92cfde69858abcebdb3eb4362cc0556dad 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_del.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.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 872261eadb5dcde8095158e1401455b84e49f713..334939c1578673214b5456be9315ebd62f559aa5 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 63374d477a2a574dd2eea430ca76488181492236..eb28f5835840e06cf0d493a7d5985dddd1f5da1c 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.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 9aa7dd816baac236576f167317c50460f99e2cfd..9d647090fd4acc299188e291ee3e47f50a2140fe 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.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 8ba9f395bd8fb5c5dddbad6bf8e71786226a5c7d..7dd705301fe991f839eaa4fb9e17eb185d4f237a 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_replace.h"

 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"