context_save.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 98b151a..4468e0e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -371,6 +371,7 @@ noinst_HEADERS = \
     sbr/context_find.h \
     sbr/context_read.h \
     sbr/context_replace.h \
     sbr/context_find.h \
     sbr/context_read.h \
     sbr/context_replace.h \

+    sbr/context_save.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 784f740..8006f65 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_save (void);

 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 *);

diff --git a/sbr/context_save.c b/sbr/context_save.c
index 01afbd8..2740321 100644 (file)
--- a/sbr/context_save.c
+++ b/sbr/context_save.c
@@ -12,6 +12,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "context_save.h"

 #include "error.h"
 #include "h/signals.h"
 #include "lock_file.h"
 #include "error.h"
 #include "h/signals.h"
 #include "lock_file.h"

diff --git a/sbr/context_save.h b/sbr/context_save.h
new file mode 100644 (file)
index 0000000..a1b70c4
--- /dev/null
+++ b/sbr/context_save.h
@@ -0,0 +1,7 @@
+/* context_save.h -- write out the updated context file
+ *
+ * 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_save(void);

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index f9d7f59..53c6b51 100644 (file)
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "context_save.h"

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

diff --git a/sbr/makedir.c b/sbr/makedir.c
index 5bb3550..1230553 100644 (file)
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -10,6 +10,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "context_save.h"

 #include "context_find.h"
 #include "atooi.h"
 #include "error.h"
 #include "context_find.h"
 #include "atooi.h"
 #include "error.h"

diff --git a/sbr/refile.c b/sbr/refile.c
index ce31273..15f016d 100644 (file)
--- a/sbr/refile.c
+++ b/sbr/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "context_save.h"

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

diff --git a/sbr/remdir.c b/sbr/remdir.c
index 18ea924..d4da1cb 100644 (file)
--- a/sbr/remdir.c
+++ b/sbr/remdir.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "context_save.h"

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

diff --git a/sbr/showfile.c b/sbr/showfile.c
index 1ce6372..2985dbe 100644 (file)
--- a/sbr/showfile.c
+++ b/sbr/showfile.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "context_save.h"

 #include "arglist.h"
 #include "error.h"
 
 #include "arglist.h"
 #include "error.h"
 

diff --git a/uip/anno.c b/uip/anno.c
index 5f175e6..508da29 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_save.h"

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

diff --git a/uip/burst.c b/uip/burst.c
index 46ac15d..57d6967 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_save.h"

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

diff --git a/uip/comp.c b/uip/comp.c
index fe7798d..382be84 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_save.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 e7ea240..13a5378 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_save.h"

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

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

+#include "sbr/context_save.h"

 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"

diff --git a/uip/flist.c b/uip/flist.c
index f3cd2a2..1584b0c 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 45f282c..c895c5b 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"

diff --git a/uip/folder.c b/uip/folder.c
index 7db8fb0..02a979a 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_del.h"
 #include "sbr/context_find.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_del.h"
 #include "sbr/context_find.h"

diff --git a/uip/forw.c b/uip/forw.c
index 654a3f7..2f1cbff 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_save.h"

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

diff --git a/uip/inc.c b/uip/inc.c
index 0cbd08d..ae41caa 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_save.h"

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

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 5bbba21..abbef09 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_save.h"

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

diff --git a/uip/mark.c b/uip/mark.c
index 201ad88..4bb8ca1 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_save.h"

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

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 6004802..303a8e6 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"

diff --git a/uip/mhlist.c b/uip/mhlist.c
index b963639..fb0554d 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_save.h"

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

diff --git a/uip/mhn.c b/uip/mhn.c
index 3c14a99..1f6e487 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"

diff --git a/uip/mhpath.c b/uip/mhpath.c
index ecb8055..7153df2 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_save.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/mhshow.c b/uip/mhshow.c
index f1c37b0..ab5a0b7 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"

diff --git a/uip/mhstore.c b/uip/mhstore.c
index ea5d457..96cf196 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"

diff --git a/uip/new.c b/uip/new.c
index 2aca1b6..a106ce4 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"

diff --git a/uip/packf.c b/uip/packf.c
index a33c866..ebc5f53 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_save.h"

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

diff --git a/uip/pick.c b/uip/pick.c
index 4dc7602..822f544 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_save.h"

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

diff --git a/uip/prompter.c b/uip/prompter.c
index d0e885a..44d5322 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_save.h"

 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 5e7f124..8f28aa0 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_save.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 660003e..654ce10 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_save.h"

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

diff --git a/uip/repl.c b/uip/repl.c
index 777f578..e0e7281 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_save.h"

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

diff --git a/uip/rmf.c b/uip/rmf.c
index 42869f9..9532888 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_del.h"
 #include "sbr/context_find.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_del.h"
 #include "sbr/context_find.h"

diff --git a/uip/scan.c b/uip/scan.c
index eb28f58..a47b868 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_save.h"

 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"

diff --git a/uip/send.c b/uip/send.c
index 4d02e13..3c5f5ab 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_save.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 9d64709..c94757a 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_save.h"

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

diff --git a/uip/sortm.c b/uip/sortm.c
index 7dd7053..e909abc 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_save.h"

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

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

+#include "sbr/context_save.h"

 #include "sbr/error.h"
 #include "h/done.h"
 
 #include "sbr/error.h"
 #include "h/done.h"
 

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index bb6f019..407a529 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/context_save.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"