picksbr.h: Rename to be alongside implementation.

diff --git a/Makefile.am b/Makefile.am
index fbce3f5ea8d65a4c4c5ab60d821b228be00a2a37..45d591a63b4505acaf8d0893c9751c91d573d3a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -353,7 +353,6 @@ noinst_HEADERS = \
     h/netsec.h \
     h/nmh.h \
     h/oauth.h \
-    h/picksbr.h \
     h/popsbr.h \
     h/prototypes.h \
     h/rcvmail.h \
@@ -463,6 +462,7 @@ noinst_HEADERS = \
     uip/mhmisc.h \
     uip/mhoutsbr.h \
     uip/mhshowsbr.h \
+    uip/picksbr.h \
     uip/replsbr.h \
     uip/scansbr.h \
     uip/sendsbr.h \

diff --git a/h/picksbr.h b/h/picksbr.h
deleted file mode 100644 (file)
index 4900642..0000000
--- a/h/picksbr.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* picksbr.h -- definitions for picksbr.c
- */
-
-/*
- * prototypes
- */
-int pcompile (char **, char *);
-int pmatches (FILE *, int, long, long, int);

diff --git a/uip/pick.c b/uip/pick.c
index 9abb826674977a8d3ed848d20433353ed9f53814..40346d1a187b5441980e0b1099e906a3e06b076e 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "picksbr.h"
 #include "sbr/m_name.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
@@ -26,7 +27,6 @@
 #include "sbr/seq_add.h"
 #include "sbr/error.h"
 #include "h/tws.h"
-#include "h/picksbr.h"
 #include "h/done.h"
 #include "h/utils.h"
 #include "sbr/m_maildir.h"

diff --git a/uip/picksbr.c b/uip/picksbr.c
index a2a8a79f21ebc0b7808a4bc20ae515863f853b72..c11fba62aae04b403a4a345dd7d131d1467e0925 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "picksbr.h"
 #include "sbr/dtime.h"
 #include "sbr/dtime.h"
 #include "sbr/m_getfld.h"
@@ -15,7 +16,6 @@
 #include "sbr/ambigsw.h"
 #include "sbr/error.h"
 #include "h/tws.h"
-#include "h/picksbr.h"
 #include "h/utils.h"
 
 #ifdef HAVE_SYS_TIME_H

diff --git a/uip/picksbr.h b/uip/picksbr.h
new file mode 100644 (file)
index 0000000..e2d0f96
--- /dev/null
+++ b/uip/picksbr.h
@@ -0,0 +1,8 @@
+/* picksbr.h -- routines to help pick along...
+ *
+ * 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. */
+
+int pcompile(char **, char *);
+int pmatches(FILE *, int, long, long, int);