path.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 6a85011..323abac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -374,6 +374,7 @@ noinst_HEADERS = \
     sbr/makedir.h \
     sbr/message_id.h \
     sbr/mime_type.h \
+    sbr/path.h \
     sbr/print_help.h \
     sbr/print_sw.h \
     sbr/print_version.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index f0d1c55..4cf3a44 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -171,10 +171,8 @@ void m_unknown(m_getfld_state_t *, FILE *);
 void m_unknown2(m_getfld_state_t *);
 
 char *nmh_getpass(const char *);
-char *path(char *, int);
 int pidwait (pid_t, int);
 int pidstatus (int, FILE *, char *);
-char *pluspath(char *);
 void push (void);
 char *r1bindex(char *, int) PURE;
 void readconfig (struct node **, FILE *, const char *, int);

diff --git a/sbr/context_read.c b/sbr/context_read.c
index 97bf140..acee394 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -22,6 +22,7 @@
  */
 
 #include "h/mh.h"
+#include "path.h"
 #include "error.h"
 #include "lock_file.h"
 #include "m_maildir.h"

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index 7fdd1c1..e9cffa1 100644 (file)
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "path.h"
 #include "error.h"
 #include "h/utils.h"
 #include "m_maildir.h"

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 8be011d..75c6baf 100644 (file)
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "path.h"
 #include "h/utils.h"
 #include "m_maildir.h"
 

diff --git a/sbr/path.c b/sbr/path.c
index 278a101..d425dc8 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "path.h"
 #include "h/utils.h"
 #include "m_maildir.h"
 

diff --git a/sbr/path.h b/sbr/path.h
new file mode 100644 (file)
index 0000000..d906cb8
--- /dev/null
+++ b/sbr/path.h
@@ -0,0 +1,8 @@
+/* path.h -- return a pathname
+ *
+ * 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 *pluspath(char *);
+char *path(char *, int);

diff --git a/uip/anno.c b/uip/anno.c
index 3b0302e..61d07db 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/burst.c b/uip/burst.c
index b034616..aab1814 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/comp.c b/uip/comp.c
index 00330e1..9c151cf 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/dist.c b/uip/dist.c
index 552a9a4..294e4f2 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/flist.c b/uip/flist.c
index f2486f5..c430335 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/seq_getnum.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index bf55a91..e218964 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/seq_getnum.h"

diff --git a/uip/folder.c b/uip/folder.c
index 1c8ca2d..9464829 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/forw.c b/uip/forw.c
index 1e875e8..afca66a 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/arglist.h"

diff --git a/uip/inc.c b/uip/inc.c
index d54ae79..da3eb96 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/install-mh.c b/uip/install-mh.c
index fc104fa..9e7cd3d 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/mark.c b/uip/mark.c
index 4709d7e..7bafbda 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/seq_bits.h"

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 2401901..09c8efe 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 2b3f9a0..d40d291 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/md5.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 2ccfb28..d5f9ab0 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/mhical.c b/uip/mhical.c
index 8609ee5..402d5ad 100644 (file)
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 0928739..8087823 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/mhn.c b/uip/mhn.c
index c333e06..d2e7d9d 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 305b452..95a9d75 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/mhshow.c b/uip/mhshow.c
index ca540e6..1f53a2b 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 92cff1b..7285e5f 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 0644753..5d99549 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/md5.h"

diff --git a/uip/packf.c b/uip/packf.c
index 376ed71..6b09214 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/pick.c b/uip/pick.c
index 942aa67..5939da1 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/seq_nameok.h"

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 0cae601..1b14119 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/seq_add.h"

diff --git a/uip/refile.c b/uip/refile.c
index 6daa7f2..8637ada 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/seq_getnum.h"

diff --git a/uip/repl.c b/uip/repl.c
index 72152bc..0bd33b8 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/rmf.c b/uip/rmf.c
index acf71e7..eaa01b7 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/rmm.c b/uip/rmm.c
index 766fd72..f000fb7 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/scan.c b/uip/scan.c
index e2cd81d..30b8f9e 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/seq_getnum.h"

diff --git a/uip/send.c b/uip/send.c
index 5128688..1467be8 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/arglist.h"

diff --git a/uip/show.c b/uip/show.c
index 08ddcf1..bc09bfa 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/arglist.h"

diff --git a/uip/sortm.c b/uip/sortm.c
index 7380aa6..8013c05 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 2d878ec..857d179 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/arglist.h"

diff --git a/uip/whom.c b/uip/whom.c
index 1a8c7ad..d7bd2ca 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"