From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Fri, 3 Nov 2017 00:07:21 +0000 (+0000)
Subject: path.c: Move interface to own file.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/6345e60c392bbf92b3d7ca2bba473f9da5c073ff

path.c: Move interface to own file.
---

diff --git a/Makefile.am b/Makefile.am
index 6a850119..323abac5 100644
--- 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 f0d1c555..4cf3a44b 100644
--- 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 97bf1404..acee3949 100644
--- 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 7fdd1c16..e9cffa18 100644
--- 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 8be011d5..75c6baf2 100644
--- 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 278a101f..d425dc8b 100644
--- 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
index 00000000..d906cb84
--- /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 3b0302e1..61d07dbd 100644
--- 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 b0346160..aab18141 100644
--- 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 00330e11..9c151cf9 100644
--- 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 552a9a46..294e4f24 100644
--- 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 f2486f51..c430335c 100644
--- 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 bf55a911..e2189645 100644
--- 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 1c8ca2dd..94648293 100644
--- 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 1e875e82..afca66a3 100644
--- 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 d54ae791..da3eb96d 100644
--- 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 fc104fa7..9e7cd3db 100644
--- 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 4709d7e4..7bafbda8 100644
--- 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 24019018..09c8efec 100644
--- 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 2b3f9a0f..d40d291a 100644
--- 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 2ccfb286..d5f9ab0d 100644
--- 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 8609ee57..402d5ad9 100644
--- 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 09287395..80878234 100644
--- 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 c333e064..d2e7d9de 100644
--- 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 305b4521..95a9d755 100644
--- 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 ca540e60..1f53a2b6 100644
--- 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 92cff1b9..7285e5f8 100644
--- 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 0644753c..5d995492 100644
--- 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 376ed71d..6b092142 100644
--- 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 942aa677..5939da17 100644
--- 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 0cae6014..1b14119a 100644
--- 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 6daa7f25..8637ada3 100644
--- 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 72152bc8..0bd33b83 100644
--- 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 acf71e74..eaa01b71 100644
--- 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 766fd722..f000fb7c 100644
--- 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 e2cd81db..30b8f9e8 100644
--- 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 51286889..1467be89 100644
--- 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 08ddcf14..bc09bfad 100644
--- 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 7380aa65..8013c055 100644
--- 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 2d878ec4..857d1792 100644
--- 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 1a8c7ad8..d7bd2cac 100644
--- 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"