getcpy.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index a467d25..54d342b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -384,6 +384,7 @@ noinst_HEADERS = \
     sbr/folder_pack.h \
     sbr/folder_read.h \
     sbr/folder_realloc.h \
     sbr/folder_pack.h \
     sbr/folder_read.h \
     sbr/folder_realloc.h \

+    sbr/getcpy.h \

     sbr/geteditor.h \
     sbr/getfolder.h \
     sbr/lock_file.h \
     sbr/geteditor.h \
     sbr/getfolder.h \
     sbr/lock_file.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index f12bf37..c0a12b5 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -110,9 +110,6 @@ char **getarguments (char *, int, char **, int);
  */
 char *get_charset(void);
 
  */
 char *get_charset(void);
 

-/* Return malloc'd copy of str, or of "" if NULL, exit on failure. */
-char *getcpy(const char *str);
-

 m_getfld_state_t m_getfld_state_init(FILE *iob);
 void m_getfld_state_reset (m_getfld_state_t *);
 void m_getfld_state_destroy (m_getfld_state_t *);
 m_getfld_state_t m_getfld_state_init(FILE *iob);
 void m_getfld_state_reset (m_getfld_state_t *);
 void m_getfld_state_destroy (m_getfld_state_t *);

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 7f961c4..62abfb9 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "getcpy.h"

 #include "context_find.h"
 #include "error.h"
 #include "h/addrsbr.h"
 #include "context_find.h"
 #include "error.h"
 #include "h/addrsbr.h"

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 96ce05e..eccb472 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 "getcpy.h"

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

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 27af937..e8a8027 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -40,6 +40,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "getcpy.h"

 #include "error.h"
 #include "h/addrsbr.h"
 #include "h/tws.h"
 #include "error.h"
 #include "h/addrsbr.h"
 #include "h/tws.h"

diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c
index 97e2a7a..c78e62d 100644 (file)
--- a/sbr/fmt_new.c
+++ b/sbr/fmt_new.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "getcpy.h"

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

diff --git a/sbr/getcpy.c b/sbr/getcpy.c
index 7182c7c..42779e0 100644 (file)
--- a/sbr/getcpy.c
+++ b/sbr/getcpy.c
@@ -10,6 +10,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "getcpy.h"

 #include "h/utils.h"
 
 /* Return malloc'd copy of str, or of "" if NULL, exit on failure. */
 #include "h/utils.h"
 
 /* Return malloc'd copy of str, or of "" if NULL, exit on failure. */

diff --git a/sbr/getcpy.h b/sbr/getcpy.h
new file mode 100644 (file)
index 0000000..c98146e
--- /dev/null
+++ b/sbr/getcpy.h
@@ -0,0 +1,12 @@
+/* getcpy.h -- copy a string in managed memory
+ *
+ * THIS IS OBSOLETE.  NEED TO REPLACE ALL OCCURRENCES
+ * OF GETCPY WITH STRDUP.  BUT THIS WILL REQUIRE
+ * CHANGING PARTS OF THE CODE TO DEAL WITH NULL VALUES.
+ *
+ * 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. */
+
+/* Return malloc'd copy of str, or of "" if NULL, exit on failure. */
+char *getcpy(const char *str);

diff --git a/sbr/netsec.c b/sbr/netsec.c
index 6a72495..98a221a 100644 (file)
--- a/sbr/netsec.c
+++ b/sbr/netsec.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "getcpy.h"

 #include "brkstring.h"
 #include "h/utils.h"
 #include "h/netsec.h"
 #include "brkstring.h"
 #include "h/utils.h"
 #include "h/netsec.h"

diff --git a/sbr/oauth.c b/sbr/oauth.c
index 718a688..8061c28 100755 (executable)
--- a/sbr/oauth.c
+++ b/sbr/oauth.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "getcpy.h"

 #include "error.h"
 
 #ifdef OAUTH_SUPPORT
 #include "error.h"
 
 #ifdef OAUTH_SUPPORT

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index 5bedadc..4d91b8b 100644 (file)
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "getcpy.h"

 #include "context_find.h"
 
 #ifdef OAUTH_SUPPORT
 #include "context_find.h"
 
 #ifdef OAUTH_SUPPORT

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index c744a3e..2df4c8e 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "getcpy.h"

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

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

+#include "getcpy.h"

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

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index c4f11a6..1670aac 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "getcpy.h"

 #include "m_atoi.h"
 #include "brkstring.h"
 #include "error.h"
 #include "m_atoi.h"
 #include "brkstring.h"
 #include "error.h"

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

+#include "sbr/getcpy.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/aliasbr.c b/uip/aliasbr.c
index 754a4d1..b5935f6 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/getcpy.h"

 #include "h/aliasbr.h"
 #include "h/addrsbr.h"
 #include "h/utils.h"
 #include "h/aliasbr.h"
 #include "h/addrsbr.h"
 #include "h/utils.h"

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

+#include "sbr/getcpy.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/fmttest.c b/uip/fmttest.c
index 4613794..8d5423f 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/getcpy.h"

 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"

diff --git a/uip/folder.c b/uip/folder.c
index 2b231bb..9800607 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/getcpy.h"

 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 6978d18..7e86244 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/getcpy.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/fmt_scan.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/fmt_scan.h"

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

+#include "sbr/getcpy.h"

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

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 9730e60..309f298 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/getcpy.h"

 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"

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

+#include "sbr/getcpy.h"

 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 9b8eb97..efa47fa 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/getcpy.h"

 #include "sbr/context_find.h"
 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"
 #include "sbr/context_find.h"
 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 7716de4..92c2097 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/getcpy.h"

 #include "sbr/context_find.h"
 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"
 #include "sbr/context_find.h"
 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"

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

+#include "sbr/getcpy.h"

 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/new.c b/uip/new.c
index 5de05d4..2d7c070 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/getcpy.h"

 #include "sbr/m_atoi.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/m_atoi.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"

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

+#include "sbr/getcpy.h"

 #include "sbr/error.h"
 #include "h/addrsbr.h"
 #include "h/fmt_scan.h"
 #include "sbr/error.h"
 #include "h/addrsbr.h"
 #include "h/fmt_scan.h"

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 8bb04fa..ec7b441 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/getcpy.h"

 #include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/folder_read.h"
 #include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/folder_read.h"

diff --git a/uip/slocal.c b/uip/slocal.c
index 9f784f8..6cace00 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -20,6 +20,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/getcpy.h"

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

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

+#include "sbr/getcpy.h"

 #include "sbr/m_draft.h"
 #include "sbr/m_backup.h"
 #include "sbr/geteditor.h"
 #include "sbr/m_draft.h"
 #include "sbr/m_backup.h"
 #include "sbr/geteditor.h"