From: Ralph Corderoy Date: Sat, 11 Nov 2017 14:20:01 +0000 (+0000) Subject: folder_read.c: Move interface to own file. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/f988c9b2845c394190c0874d783bbf74f6b8b293 folder_read.c: Move interface to own file. --- diff --git a/Makefile.am b/Makefile.am index 29756707..5e234030 100644 --- a/Makefile.am +++ b/Makefile.am @@ -379,6 +379,7 @@ noinst_HEADERS = \ sbr/folder_delmsgs.h \ sbr/folder_free.h \ sbr/folder_pack.h \ + sbr/folder_read.h \ sbr/folder_realloc.h \ sbr/lock_file.h \ sbr/m_maildir.h \ diff --git a/h/prototypes.h b/h/prototypes.h index 3db5f0d7..eae5956d 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -75,18 +75,6 @@ void escape_local_part (char *, size_t); int ext_hook(char *, char *, char *); int fdcompare (int, int); -/* - * Read a MH folder structure and return an allocated "struct msgs" - * corresponding to the contents of the folder. - * - * Arguments include: - * - * name - Name of folder - * lockflag - If true, write-lock (and keep open) metadata files. - * See comments for seq_read() for more information. - */ -struct msgs *folder_read (char *name, int lockflag); - /* * Print null-terminated PROMPT to and flush standard output. Read answers from * standard input until one matches an entry in SWITCHES. When one matches, diff --git a/sbr/folder_read.c b/sbr/folder_read.c index 589fac0f..fd75988a 100644 --- a/sbr/folder_read.c +++ b/sbr/folder_read.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "folder_read.h" #include "error.h" #include "h/utils.h" #include "m_maildir.h" diff --git a/sbr/folder_read.h b/sbr/folder_read.h new file mode 100644 index 00000000..0ebdb3d6 --- /dev/null +++ b/sbr/folder_read.h @@ -0,0 +1,17 @@ +/* folder_read.h -- initialize folder structure and read folder + * + * 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. */ + +/* + * Read a MH folder structure and return an allocated "struct msgs" + * corresponding to the contents of the folder. + * + * Arguments include: + * + * name - Name of folder + * lockflag - If true, write-lock (and keep open) metadata files. + * See comments for seq_read() for more information. + */ +struct msgs *folder_read(char *name, int lockflag); diff --git a/sbr/m_draft.c b/sbr/m_draft.c index 9798758f..0ec7829b 100644 --- a/sbr/m_draft.c +++ b/sbr/m_draft.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "folder_read.h" #include "folder_realloc.h" #include "folder_free.h" #include "context_find.h" diff --git a/uip/anno.c b/uip/anno.c index 2ec2ef98..18fc4dd7 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -42,6 +42,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" diff --git a/uip/burst.c b/uip/burst.c index a459c5c2..cfb3aba3 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_realloc.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" diff --git a/uip/comp.c b/uip/comp.c index 382be84d..8609d5b3 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_find.h" #include "sbr/ambigsw.h" diff --git a/uip/dist.c b/uip/dist.c index 13a53782..242fa75e 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" diff --git a/uip/flist.c b/uip/flist.c index d94d01bf..28592791 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -14,6 +14,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" diff --git a/uip/fmttest.c b/uip/fmttest.c index 7d528c1f..798b573d 100644 --- a/uip/fmttest.c +++ b/uip/fmttest.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" diff --git a/uip/folder.c b/uip/folder.c index f30f3fc3..8cea4fa5 100644 --- a/uip/folder.c +++ b/uip/folder.c @@ -8,6 +8,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_pack.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" diff --git a/uip/forw.c b/uip/forw.c index 2f1cbffa..e0c5423d 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" diff --git a/uip/inc.c b/uip/inc.c index de0c7993..ea1b4312 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -31,6 +31,7 @@ #endif #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_realloc.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" diff --git a/uip/mark.c b/uip/mark.c index 59a33da2..7ca41aae 100644 --- a/uip/mark.c +++ b/uip/mark.c @@ -8,6 +8,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index f07d0f54..faca5716 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -14,6 +14,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_find.h" #include "sbr/brkstring.h" diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index 303a8e63..1468fbc6 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" diff --git a/uip/mhlist.c b/uip/mhlist.c index fb0554d4..0bbe5903 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" diff --git a/uip/mhn.c b/uip/mhn.c index 1f6e4870..95aed5db 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" diff --git a/uip/mhpath.c b/uip/mhpath.c index 9155b575..81a69cbd 100644 --- a/uip/mhpath.c +++ b/uip/mhpath.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_realloc.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" diff --git a/uip/mhshow.c b/uip/mhshow.c index ab5a0b7b..f9d5a5b5 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" diff --git a/uip/mhstore.c b/uip/mhstore.c index 96cf196d..968c2f29 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index 8ae51c4e..5855b0b8 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/folder_addmsg.h" #include "sbr/context_find.h" diff --git a/uip/packf.c b/uip/packf.c index 133a9ec6..f414ce35 100644 --- a/uip/packf.c +++ b/uip/packf.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" diff --git a/uip/pick.c b/uip/pick.c index 141d480f..a8599c6a 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" diff --git a/uip/rcvstore.c b/uip/rcvstore.c index 594bc35c..61980ea2 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/folder_addmsg.h" #include "sbr/context_save.h" diff --git a/uip/refile.c b/uip/refile.c index cb9cac37..16cc7fcc 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -7,6 +7,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/folder_delmsgs.h" #include "sbr/folder_addmsg.h" diff --git a/uip/repl.c b/uip/repl.c index e0e72813..1be63fbb 100644 --- a/uip/repl.c +++ b/uip/repl.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" diff --git a/uip/rmm.c b/uip/rmm.c index 08214a09..38090baa 100644 --- a/uip/rmm.c +++ b/uip/rmm.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/folder_delmsgs.h" #include "sbr/context_replace.h" diff --git a/uip/scan.c b/uip/scan.c index 52343f75..74876236 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" diff --git a/uip/send.c b/uip/send.c index 3c5f5ab6..9cc0ca59 100644 --- a/uip/send.c +++ b/uip/send.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_find.h" #include "sbr/brkstring.h" diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 80a79f01..ab4f73ce 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_find.h" #include "sbr/brkstring.h" diff --git a/uip/show.c b/uip/show.c index c94757a6..9d387f63 100644 --- a/uip/show.c +++ b/uip/show.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" diff --git a/uip/sortm.c b/uip/sortm.c index 55271ffc..438a81ba 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_read.h" #include "sbr/folder_free.h" #include "sbr/context_save.h" #include "sbr/context_replace.h"