diff --git a/.clang-format b/.clang-format index 45aef4e950b..4e8568232ec 100644 --- a/.clang-format +++ b/.clang-format @@ -16,7 +16,7 @@ IncludeCategories: Priority: -7 - Regex: '".*_private\.h"' Priority: -6 - - Regex: '"lib/.*\.h"' + - Regex: '"mutt/.*\.h"' Priority: -4 - Regex: '"conn/.*\.h"' Priority: -3 diff --git a/Makefile.am b/Makefile.am index 29604c70654..c49ec5c0fe5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-sasl \ --with-tokyocabinet -SUBDIRS = m4 contrib imap ncrypt lib conn +SUBDIRS = m4 contrib imap ncrypt mutt conn if BUILD_HCACHE SUBDIRS += hcache @@ -65,8 +65,8 @@ LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a LIBCONN = -Lconn -lconn LIBCONNDEPS = $(top_srcdir)/conn/connection.h conn/libconn.a -LIBMUTT = -Llib -lmutt -LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libmutt.a +LIBMUTT = -Lmutt -lmutt +LIBMUTTDEPS = $(top_srcdir)/mutt/mutt.h mutt/libmutt.a neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \ $(LIBIMAP) $(LIBCONN) $(LIBMUTT) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS) diff --git a/Makefile.autosetup b/Makefile.autosetup index 15ff61688e8..5c405054649 100644 --- a/Makefile.autosetup +++ b/Makefile.autosetup @@ -90,9 +90,9 @@ ALLOBJS+= $(NEOMUTTOBJS) ############################################################################### # libmutt LIBMUTT= libmutt.a -LIBMUTTOBJS= lib/base64.o lib/buffer.o lib/date.o lib/debug.o lib/exit.o \ - lib/file.o lib/hash.o lib/list.o lib/mapping.o lib/mbyte.o lib/md5.o \ - lib/memory.o lib/message.o lib/sha1.o lib/string.o +LIBMUTTOBJS= mutt/base64.o mutt/buffer.o mutt/date.o mutt/debug.o mutt/exit.o \ + mutt/file.o mutt/hash.o mutt/list.o mutt/mapping.o mutt/mbyte.o mutt/md5.o \ + mutt/memory.o mutt/message.o mutt/sha1.o mutt/string.o CLEANFILES+= $(LIBMUTT) $(LIBMUTTOBJS) MUTTLIBS+= $(LIBMUTT) ALLOBJS+= $(LIBMUTTOBJS) @@ -267,14 +267,14 @@ git_ver.h: $(ALL_FILES) rm -f git_ver.h.tmp hcache/hcversion.h: $(SRCDIR)/mutt.h $(SRCDIR)/address.h \ - $(SRCDIR)/lib/list.h $(SRCDIR)/lib/buffer.h \ + $(SRCDIR)/mutt/list.h $(SRCDIR)/mutt/buffer.h \ $(SRCDIR)/parameter.h $(SRCDIR)/body.h \ $(SRCDIR)/envelope.h $(SRCDIR)/header.h \ $(SRCDIR)/hcache/hcachever.sh \ $(PWD)/hcache ( echo '#include "config.h"'; echo '#include "mutt.h"'; \ - echo '#include "address.h"'; echo '#include "lib/list.h"'; \ - echo '#include "lib/buffer.h"'; echo '#include "parameter.h"'; \ + echo '#include "address.h"'; echo '#include "mutt/list.h"'; \ + echo '#include "mutt/buffer.h"'; echo '#include "parameter.h"'; \ echo '#include "body.h"'; echo '#include "envelope.h"'; \ echo '#include "header.h"';) | $(CPP) $(CFLAGS) - | \ sh $(SRCDIR)/hcache/hcachever.sh hcache/hcversion.h diff --git a/addrbook.c b/addrbook.c index 186d34a7d87..be6e5634944 100644 --- a/addrbook.c +++ b/addrbook.c @@ -24,7 +24,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "alias.h" diff --git a/alias.c b/alias.c index 6f4a283fa3d..3e334e99c28 100644 --- a/alias.c +++ b/alias.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "alias.h" @@ -694,4 +694,3 @@ void mutt_free_alias(struct Alias **p) FREE(&t); } } - diff --git a/attach.c b/attach.c index ab2207bcfbf..223abd5b859 100644 --- a/attach.c +++ b/attach.c @@ -28,7 +28,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "attach.h" #include "body.h" diff --git a/bcache.c b/bcache.c index a29c87f6776..0f970f717e9 100644 --- a/bcache.c +++ b/bcache.c @@ -29,7 +29,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "bcache.h" #include "globals.h" #include "mutt_account.h" diff --git a/body.c b/body.c index 8e0941217ab..a1e02f91a98 100644 --- a/body.c +++ b/body.c @@ -24,9 +24,9 @@ #include #include #include -#include "lib/debug.h" -#include "lib/memory.h" -#include "lib/string2.h" +#include "mutt/debug.h" +#include "mutt/memory.h" +#include "mutt/string2.h" #include "body.h" #include "header.h" #include "mime.h" diff --git a/browser.c b/browser.c index 5fc79d29a71..d46209ee875 100644 --- a/browser.c +++ b/browser.c @@ -39,7 +39,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "attach.h" diff --git a/buffy.c b/buffy.c index 9f10ecc1e14..5e26c641118 100644 --- a/buffy.c +++ b/buffy.c @@ -29,7 +29,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "buffy.h" #include "context.h" diff --git a/charset.c b/charset.c index 1c25af56ced..267df735286 100644 --- a/charset.c +++ b/charset.c @@ -27,7 +27,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "charset.h" #include "globals.h" diff --git a/color.c b/color.c index 2364f392c4e..f4b8de56e08 100644 --- a/color.c +++ b/color.c @@ -26,7 +26,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "context.h" #include "globals.h" diff --git a/commands.c b/commands.c index e398874e46d..e6e445d9cff 100644 --- a/commands.c +++ b/commands.c @@ -34,7 +34,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "alias.h" #include "body.h" diff --git a/complete.c b/complete.c index 7bfd7fca5aa..9358ee756e4 100644 --- a/complete.c +++ b/complete.c @@ -26,7 +26,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "globals.h" #include "options.h" #include "protos.h" diff --git a/compose.c b/compose.c index c5fbb1a8657..eca9724da68 100644 --- a/compose.c +++ b/compose.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "alias.h" diff --git a/compress.c b/compress.c index a7fd296ed68..0e6f7b33bd3 100644 --- a/compress.c +++ b/compress.c @@ -27,7 +27,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "compress.h" #include "context.h" diff --git a/configure.ac b/configure.ac index c59dc517a6b..e739f1f5867 100644 --- a/configure.ac +++ b/configure.ac @@ -947,7 +947,7 @@ if test x$full_doc != xno; then fi AC_CONFIG_FILES(Makefile contrib/Makefile doc/Makefile imap/Makefile - m4/Makefile po/Makefile.in hcache/Makefile ncrypt/Makefile lib/Makefile conn/Makefile) + m4/Makefile po/Makefile.in hcache/Makefile ncrypt/Makefile mutt/Makefile conn/Makefile) AC_OUTPUT AC_MSG_NOTICE([Summary of build options: diff --git a/conn/connection.h b/conn/connection.h index cfa079054e8..dec678c82c6 100644 --- a/conn/connection.h +++ b/conn/connection.h @@ -26,7 +26,7 @@ #include #include -#include "lib/queue.h" +#include "mutt/queue.h" #include "account.h" #define LONG_STRING 1024 diff --git a/conn/getdomain.c b/conn/getdomain.c index f415e997b2f..593a7607936 100644 --- a/conn/getdomain.c +++ b/conn/getdomain.c @@ -36,9 +36,9 @@ #include #include #include -#include "lib/debug.h" -#include "lib/memory.h" -#include "lib/string2.h" +#include "mutt/debug.h" +#include "mutt/memory.h" +#include "mutt/string2.h" /** * getdnsdomainname - Lookup the host's name using DNS diff --git a/conn/sasl.c b/conn/sasl.c index eef0afdf1ab..f71707f7b96 100644 --- a/conn/sasl.c +++ b/conn/sasl.c @@ -53,10 +53,10 @@ #include #include #include -#include "lib/debug.h" -#include "lib/memory.h" -#include "lib/message.h" -#include "lib/string2.h" +#include "mutt/debug.h" +#include "mutt/memory.h" +#include "mutt/message.h" +#include "mutt/string2.h" #include "sasl.h" #include "account.h" #include "connection.h" diff --git a/conn/sasl_plain.c b/conn/sasl_plain.c index 2f218df72be..0366e958a32 100644 --- a/conn/sasl_plain.c +++ b/conn/sasl_plain.c @@ -32,8 +32,8 @@ #include "config.h" #include -#include "lib/base64.h" -#include "lib/string2.h" +#include "mutt/base64.h" +#include "mutt/string2.h" /** * mutt_sasl_plain_msg - Create an SASL command diff --git a/conn/socket.c b/conn/socket.c index 5846391afc0..c1d52c11846 100644 --- a/conn/socket.c +++ b/conn/socket.c @@ -57,10 +57,10 @@ #include #include #include -#include "lib/debug.h" -#include "lib/memory.h" -#include "lib/message.h" -#include "lib/string2.h" +#include "mutt/debug.h" +#include "mutt/memory.h" +#include "mutt/message.h" +#include "mutt/string2.h" #include "account.h" #include "conn_globals.h" #include "connection.h" diff --git a/conn/ssl.c b/conn/ssl.c index cbeacd49338..04b0a444c6e 100644 --- a/conn/ssl.c +++ b/conn/ssl.c @@ -52,11 +52,11 @@ #include #include #include -#include "lib/debug.h" -#include "lib/file.h" -#include "lib/memory.h" -#include "lib/message.h" -#include "lib/string2.h" +#include "mutt/debug.h" +#include "mutt/file.h" +#include "mutt/memory.h" +#include "mutt/message.h" +#include "mutt/string2.h" #include "mutt.h" #include "ssl.h" #include "account.h" diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c index 872de994906..972256e4432 100644 --- a/conn/ssl_gnutls.c +++ b/conn/ssl_gnutls.c @@ -42,12 +42,12 @@ #include #include #include -#include "lib/date.h" -#include "lib/debug.h" -#include "lib/file.h" -#include "lib/memory.h" -#include "lib/message.h" -#include "lib/string2.h" +#include "mutt/date.h" +#include "mutt/debug.h" +#include "mutt/file.h" +#include "mutt/memory.h" +#include "mutt/message.h" +#include "mutt/string2.h" #include "mutt.h" #include "account.h" #include "conn_globals.h" diff --git a/conn/tunnel.c b/conn/tunnel.c index 86ea547e145..e0871205ce2 100644 --- a/conn/tunnel.c +++ b/conn/tunnel.c @@ -41,9 +41,9 @@ #include #include #include -#include "lib/memory.h" -#include "lib/message.h" -#include "lib/string2.h" +#include "mutt/memory.h" +#include "mutt/message.h" +#include "mutt/string2.h" #include "mutt.h" #include "tunnel.h" #include "account.h" diff --git a/copy.c b/copy.c index f4bd48b595d..fb422e28766 100644 --- a/copy.c +++ b/copy.c @@ -25,7 +25,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "copy.h" #include "address.h" @@ -540,8 +540,7 @@ static int count_delete_lines(FILE *fp, struct Body *b, LOFF_T *length, size_t d * * #MUTT_CM_DECODE_PGP used for decoding PGP messages * * #MUTT_CM_CHARCONV perform character set conversion */ -int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Header *hdr, int flags, - int chflags) +int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Header *hdr, int flags, int chflags) { struct Body *body = hdr->content; char prefix[SHORT_STRING]; diff --git a/curs_lib.c b/curs_lib.c index 2c2078c154c..dc2ed1d82e9 100644 --- a/curs_lib.c +++ b/curs_lib.c @@ -41,7 +41,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "context.h" #include "enter_state.h" diff --git a/curs_main.c b/curs_main.c index 97acba5d9c5..9d6e67c8652 100644 --- a/curs_main.c +++ b/curs_main.c @@ -31,7 +31,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "alias.h" diff --git a/edit.c b/edit.c index a228f064f2d..edab0756bac 100644 --- a/edit.c +++ b/edit.c @@ -33,7 +33,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "alias.h" #include "body.h" diff --git a/editmsg.c b/editmsg.c index 0d5b3ad5a7d..629ea7a6262 100644 --- a/editmsg.c +++ b/editmsg.c @@ -31,7 +31,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "context.h" #include "copy.h" @@ -52,8 +52,7 @@ * @retval 0 Message edited successfully * @retval -1 Error */ -static int edit_or_view_one_message(bool edit, struct Context *ctx, - struct Header *cur) +static int edit_or_view_one_message(bool edit, struct Context *ctx, struct Header *cur) { char tmp[_POSIX_PATH_MAX]; char buff[STRING]; diff --git a/enter.c b/enter.c index d939d12a752..780fc0b14f3 100644 --- a/enter.c +++ b/enter.c @@ -27,7 +27,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "enter_state.h" #include "globals.h" @@ -149,7 +149,7 @@ int mutt_enter_string(char *buf, size_t buflen, int col, int flags) * @retval -1 if abort */ int mutt_enter_string_full(char *buf, size_t buflen, int col, int flags, int multiple, - char ***files, int *numfiles, struct EnterState *state) + char ***files, int *numfiles, struct EnterState *state) { int width = MuttMessageWindow->cols - col - 1; int redraw; diff --git a/enter_state.h b/enter_state.h index 87c1822600e..c4d2474e960 100644 --- a/enter_state.h +++ b/enter_state.h @@ -24,7 +24,7 @@ #define _MUTT_ENTER_STATE_H #include -#include "lib/lib.h" +#include "mutt/mutt.h" /** * struct EnterState - Keep our place when entering a string diff --git a/envelope.c b/envelope.c index 01707d3289e..1e36ba26455 100644 --- a/envelope.c +++ b/envelope.c @@ -34,9 +34,9 @@ #include "config.h" #include -#include "lib/buffer.h" -#include "lib/memory.h" -#include "lib/queue.h" +#include "mutt/buffer.h" +#include "mutt/memory.h" +#include "mutt/queue.h" #include "envelope.h" #include "rfc822.h" diff --git a/envelope.h b/envelope.h index e13f269cf0b..2453224359f 100644 --- a/envelope.h +++ b/envelope.h @@ -24,7 +24,7 @@ #define _MUTT_ENVELOPE_H #include -#include "lib/list.h" +#include "mutt/list.h" /** * struct Envelope - The header of an email diff --git a/flags.c b/flags.c index 3b3c198a4f0..7103f289237 100644 --- a/flags.c +++ b/flags.c @@ -23,7 +23,7 @@ #include "config.h" #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "context.h" #include "globals.h" diff --git a/from.c b/from.c index f5f7550c379..492c54c8beb 100644 --- a/from.c +++ b/from.c @@ -26,7 +26,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "globals.h" #include "protos.h" diff --git a/globals.h b/globals.h index 5fd8e97bada..27395e65585 100644 --- a/globals.h +++ b/globals.h @@ -24,7 +24,7 @@ #define _MUTT_GLOBALS_H #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "where.h" #include "mutt_regex.h" diff --git a/group.c b/group.c index de83ae474c6..db7d569bcd0 100644 --- a/group.c +++ b/group.c @@ -23,7 +23,7 @@ #include "config.h" #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "group.h" #include "address.h" diff --git a/handler.c b/handler.c index 2fb71a92b1d..fefc5619a25 100644 --- a/handler.c +++ b/handler.c @@ -37,7 +37,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "body.h" #include "charset.h" diff --git a/hcache/Makefile.am b/hcache/Makefile.am index ac3aefd2037..b0f67044e16 100644 --- a/hcache/Makefile.am +++ b/hcache/Makefile.am @@ -37,20 +37,20 @@ libhcache_a_SOURCES += tc.c endif LIBMUTT = -L../lib -lmutt -LIBMUTTDEPS = $(top_srcdir)/lib/lib.h ../lib/libmutt.a +LIBMUTTDEPS = $(top_srcdir)/mutt/lib.h ../mutt/libmutt.a BUILT_SOURCES = $(HCVERSION) $(top_srcdir)/keymap_defs.h: +$(MAKE) -C $(top_srcdir) keymap_defs.h -hcversion.h: $(top_srcdir)/mutt.h $(top_srcdir)/address.h $(top_srcdir)/lib/list.h \ - $(top_srcdir)/lib/buffer.h $(top_srcdir)/parameter.h \ +hcversion.h: $(top_srcdir)/mutt.h $(top_srcdir)/address.h $(top_srcdir)/mutt/list.h \ + $(top_srcdir)/mutt/buffer.h $(top_srcdir)/parameter.h \ $(top_srcdir)/body.h $(top_srcdir)/envelope.h \ $(top_srcdir)/header.h $(srcdir)/hcachever.sh ( echo '#include "config.h"'; echo '#include "mutt.h"'; \ - echo '#include "address.h"'; echo '#include "lib/list.h"'; \ - echo '#include "lib/buffer.h"'; echo '#include "parameter.h"'; \ + echo '#include "address.h"'; echo '#include "mutt/list.h"'; \ + echo '#include "mutt/buffer.h"'; echo '#include "parameter.h"'; \ echo '#include "body.h"'; echo '#include "envelope.h"'; \ echo '#include "header.h"'; \ ) | $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | sh $(srcdir)/hcachever.sh hcversion.h diff --git a/hcache/bdb.c b/hcache/bdb.c index 5518c08861b..0f3b96cfb9f 100644 --- a/hcache/bdb.c +++ b/hcache/bdb.c @@ -39,7 +39,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "backend.h" #include "globals.h" #include "mx.h" diff --git a/hcache/gdbm.c b/hcache/gdbm.c index 34c81e773c0..6d43e950796 100644 --- a/hcache/gdbm.c +++ b/hcache/gdbm.c @@ -33,7 +33,7 @@ #include "config.h" #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "backend.h" #include "globals.h" diff --git a/hcache/hcache.c b/hcache/hcache.c index 8f70675d7e6..57c1de43dd1 100644 --- a/hcache/hcache.c +++ b/hcache/hcache.c @@ -47,7 +47,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "address.h" #include "backend.h" #include "body.h" diff --git a/hcache/kc.c b/hcache/kc.c index 6a6e2116c8c..291c4d79385 100644 --- a/hcache/kc.c +++ b/hcache/kc.c @@ -34,7 +34,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "backend.h" #include "options.h" diff --git a/hcache/lmdb.c b/hcache/lmdb.c index 435daf88aab..50698e87358 100644 --- a/hcache/lmdb.c +++ b/hcache/lmdb.c @@ -33,7 +33,7 @@ #include "config.h" #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "backend.h" /** The maximum size of the database file (2GiB). diff --git a/hcache/qdbm.c b/hcache/qdbm.c index 7c3ba5edaaa..f8cec63aef1 100644 --- a/hcache/qdbm.c +++ b/hcache/qdbm.c @@ -34,7 +34,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "backend.h" #include "options.h" diff --git a/hcache/tc.c b/hcache/tc.c index 350ab678171..47a09c7a8ab 100644 --- a/hcache/tc.c +++ b/hcache/tc.c @@ -34,7 +34,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "backend.h" #include "options.h" diff --git a/hdrline.c b/hdrline.c index ad94363b9c4..1b89a450c0b 100644 --- a/hdrline.c +++ b/hdrline.c @@ -30,7 +30,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "body.h" diff --git a/header.c b/header.c index 5f0d8fb2b9c..c2f7de9df7e 100644 --- a/header.c +++ b/header.c @@ -28,14 +28,14 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" +#include "header.h" #include "alias.h" #include "body.h" #include "context.h" #include "envelope.h" #include "globals.h" -#include "header.h" #include "mutt_idna.h" #include "ncrypt/ncrypt.h" #include "options.h" @@ -385,4 +385,3 @@ struct Header *mutt_new_header(void) STAILQ_INIT(&h->tags); return h; } - diff --git a/header.h b/header.h index 4f634e18f95..0db5c054b6c 100644 --- a/header.h +++ b/header.h @@ -26,7 +26,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt_tags.h" /** diff --git a/help.c b/help.c index 218cf89db65..318ba5d8e13 100644 --- a/help.c +++ b/help.c @@ -28,7 +28,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "globals.h" #include "keymap.h" #include "mbyte.h" diff --git a/history.c b/history.c index e8a9432a9c0..68701c27d8c 100644 --- a/history.c +++ b/history.c @@ -26,7 +26,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "history.h" #include "charset.h" #include "globals.h" diff --git a/hook.c b/hook.c index 034bd583181..d949eaa2a88 100644 --- a/hook.c +++ b/hook.c @@ -28,7 +28,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "context.h" diff --git a/imap/auth.c b/imap/auth.c index dc205e2f0ad..5ea3c7f0a7e 100644 --- a/imap/auth.c +++ b/imap/auth.c @@ -34,7 +34,7 @@ #include "config.h" #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "auth.h" #include "globals.h" #include "protos.h" diff --git a/imap/auth_anon.c b/imap/auth_anon.c index af67e46d355..d6a0bb10cc9 100644 --- a/imap/auth_anon.c +++ b/imap/auth_anon.c @@ -32,7 +32,7 @@ #include "config.h" #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "auth.h" #include "globals.h" diff --git a/imap/auth_cram.c b/imap/auth_cram.c index 14f5c8e5286..6a593ad33f8 100644 --- a/imap/auth_cram.c +++ b/imap/auth_cram.c @@ -34,7 +34,7 @@ #include #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "auth.h" #include "globals.h" diff --git a/imap/auth_gss.c b/imap/auth_gss.c index bac5629a97b..aea2d758a56 100644 --- a/imap/auth_gss.c +++ b/imap/auth_gss.c @@ -35,7 +35,7 @@ #include #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "auth.h" diff --git a/imap/auth_login.c b/imap/auth_login.c index 65cadab5aa2..f5b66abb1fc 100644 --- a/imap/auth_login.c +++ b/imap/auth_login.c @@ -33,7 +33,7 @@ #include "config.h" #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "auth.h" diff --git a/imap/auth_plain.c b/imap/auth_plain.c index a56e543378a..355125dc0f8 100644 --- a/imap/auth_plain.c +++ b/imap/auth_plain.c @@ -33,7 +33,7 @@ #include "config.h" #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "auth.h" #include "globals.h" diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c index ee76d73b733..134cb290046 100644 --- a/imap/auth_sasl.c +++ b/imap/auth_sasl.c @@ -37,7 +37,7 @@ #include #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "auth.h" #include "globals.h" diff --git a/imap/browse.c b/imap/browse.c index d25e427f831..333aa0032e7 100644 --- a/imap/browse.c +++ b/imap/browse.c @@ -42,7 +42,7 @@ #include #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "browser.h" #include "buffy.h" diff --git a/imap/command.c b/imap/command.c index c064098b32b..c9425821c05 100644 --- a/imap/command.c +++ b/imap/command.c @@ -46,7 +46,7 @@ #include #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "buffy.h" #include "context.h" diff --git a/imap/imap.c b/imap/imap.c index 3aadb33d2e9..f18005c72fc 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -80,7 +80,7 @@ #include #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "imap.h" diff --git a/imap/imap_private.h b/imap/imap_private.h index 15e4bd822d6..ab857c0a5f3 100644 --- a/imap/imap_private.h +++ b/imap/imap_private.h @@ -27,7 +27,7 @@ #include #include #include -#include "lib/list.h" +#include "mutt/list.h" #ifdef USE_HCACHE #include "hcache/hcache.h" #endif diff --git a/imap/message.c b/imap/message.c index 937662cf00d..b52320f7f06 100644 --- a/imap/message.c +++ b/imap/message.c @@ -48,7 +48,7 @@ #include #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "message.h" diff --git a/imap/message.h b/imap/message.h index 040da7f61d1..6aa4ef3865f 100644 --- a/imap/message.h +++ b/imap/message.h @@ -26,7 +26,7 @@ #include #include -#include "lib/list.h" +#include "mutt/list.h" /** * struct ImapHeaderData - IMAP-specific header data diff --git a/imap/utf7.c b/imap/utf7.c index b33f00056e3..a944ca522df 100644 --- a/imap/utf7.c +++ b/imap/utf7.c @@ -34,7 +34,7 @@ #include "config.h" #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "charset.h" #include "globals.h" diff --git a/imap/util.c b/imap/util.c index a104894b707..098b41c9040 100644 --- a/imap/util.c +++ b/imap/util.c @@ -76,7 +76,7 @@ #include #include #include "imap_private.h" -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "bcache.h" diff --git a/init.c b/init.c index 5759c1b6874..55f80b4f967 100644 --- a/init.c +++ b/init.c @@ -36,7 +36,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "init.h" #include "address.h" diff --git a/keymap.c b/keymap.c index 01f984ba4b1..8dba8843c15 100644 --- a/keymap.c +++ b/keymap.c @@ -27,7 +27,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "keymap.h" #include "functions.h" diff --git a/keymap.h b/keymap.h index 2f1ba647830..d8e44b2d2a3 100644 --- a/keymap.h +++ b/keymap.h @@ -24,7 +24,7 @@ #define _MUTT_KEYMAP_H #include -#include "lib/mapping.h" +#include "mutt/mapping.h" /* maximal length of a key binding sequence used for buffer in km_bindkey */ #define MAX_SEQ 8 diff --git a/main.c b/main.c index 7e8f3d53171..5b6033b5e80 100644 --- a/main.c +++ b/main.c @@ -37,7 +37,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "address.h" diff --git a/mbox.c b/mbox.c index a23b0fe4133..8cd6702abbd 100644 --- a/mbox.c +++ b/mbox.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "body.h" @@ -1157,7 +1157,7 @@ static int mbox_sync_mailbox(struct Context *ctx, int *index_hint) newOffset[i - first].hdr = ftello(fp) + offset; if (mutt_copy_message_ctx(fp, ctx, ctx->hdrs[i], MUTT_CM_UPDATE, - CH_FROM | CH_UPDATE | CH_UPDATE_LEN) != 0) + CH_FROM | CH_UPDATE | CH_UPDATE_LEN) != 0) { mutt_perror(tempfile); mutt_sleep(5); diff --git a/mbyte.c b/mbyte.c index 74803841dc5..391c01737f5 100644 --- a/mbyte.c +++ b/mbyte.c @@ -27,7 +27,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mbyte.h" #include "charset.h" #include "options.h" diff --git a/mbyte.h b/mbyte.h index 53506ddc55e..367aeb02f45 100644 --- a/mbyte.h +++ b/mbyte.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MBYTE_H -#define _MUTT_MBYTE_H +#ifndef _NEOMUTT_MBYTE_H +#define _NEOMUTT_MBYTE_H #include #include @@ -32,4 +32,4 @@ extern bool Charset_is_utf8; bool is_display_corrupting_utf8(wchar_t wc); int mutt_filter_unprintable(char **s); -#endif /* _MUTT_MBYTE_H */ +#endif /* _NEOMUTT_MBYTE_H */ diff --git a/menu.c b/menu.c index ebd1bdfd779..51d603b5d82 100644 --- a/menu.c +++ b/menu.c @@ -30,7 +30,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "context.h" #include "globals.h" diff --git a/mh.c b/mh.c index 3a3b82de7d5..28f5670ba7e 100644 --- a/mh.c +++ b/mh.c @@ -43,7 +43,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "body.h" #include "buffy.h" diff --git a/lib/Makefile.am b/mutt/Makefile.am similarity index 100% rename from lib/Makefile.am rename to mutt/Makefile.am diff --git a/lib/base64.c b/mutt/base64.c similarity index 100% rename from lib/base64.c rename to mutt/base64.c diff --git a/lib/base64.h b/mutt/base64.h similarity index 92% rename from lib/base64.h rename to mutt/base64.h index 116befedf24..174c6ee796a 100644 --- a/lib/base64.h +++ b/mutt/base64.h @@ -18,8 +18,8 @@ * this program. If not, see . */ -#ifndef _LIB_BASE64_H -#define _LIB_BASE64_H +#ifndef _MUTT_BASE64_H +#define _MUTT_BASE64_H #include @@ -30,4 +30,4 @@ extern const int Index_64[]; size_t mutt_to_base64(char *out, const char *cin, size_t len, size_t olen); int mutt_from_base64(char *out, const char *in); -#endif /* _LIB_BASE64_H */ +#endif /* _MUTT_BASE64_H */ diff --git a/lib/buffer.c b/mutt/buffer.c similarity index 100% rename from lib/buffer.c rename to mutt/buffer.c diff --git a/lib/buffer.h b/mutt/buffer.h similarity index 95% rename from lib/buffer.h rename to mutt/buffer.h index efb78e08728..5642b4d9875 100644 --- a/lib/buffer.h +++ b/mutt/buffer.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _LIB_BUFFER_H -#define _LIB_BUFFER_H +#ifndef _MUTT_BUFFER_H +#define _MUTT_BUFFER_H #include @@ -48,4 +48,4 @@ struct Buffer *mutt_buffer_new(void); int mutt_buffer_printf(struct Buffer *buf, const char *fmt, ...); void mutt_buffer_reset(struct Buffer *b); -#endif /* _LIB_BUFFER_H */ +#endif /* _MUTT_BUFFER_H */ diff --git a/lib/date.c b/mutt/date.c similarity index 100% rename from lib/date.c rename to mutt/date.c diff --git a/lib/date.h b/mutt/date.h similarity index 96% rename from lib/date.h rename to mutt/date.h index 9594b98ff29..64cd1162236 100644 --- a/lib/date.h +++ b/mutt/date.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _LIB_DATE_H -#define _LIB_DATE_H +#ifndef _MUTT_DATE_H +#define _MUTT_DATE_H #include #include @@ -51,4 +51,4 @@ time_t mutt_mktime(struct tm *t, int local); void mutt_normalize_time(struct tm *tm); time_t mutt_parse_date(const char *s, struct Tz *tz_out); -#endif /* _LIB_DATE_H */ +#endif /* _MUTT_DATE_H */ diff --git a/lib/debug.c b/mutt/debug.c similarity index 100% rename from lib/debug.c rename to mutt/debug.c diff --git a/lib/debug.h b/mutt/debug.h similarity index 92% rename from lib/debug.h rename to mutt/debug.h index 0f14f2db22a..9208b9ee11b 100644 --- a/lib/debug.h +++ b/mutt/debug.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _LIB_DEBUG_H -#define _LIB_DEBUG_H +#ifndef _MUTT_DEBUG_H +#define _MUTT_DEBUG_H #ifdef DEBUG void mutt_debug(int level, const char *fmt, ...); @@ -29,4 +29,4 @@ void mutt_debug(int level, const char *fmt, ...); #define mutt_debug(...) do { } while (0) #endif -#endif /* _LIB_DEBUG_H */ +#endif /* _MUTT_DEBUG_H */ diff --git a/lib/exit.c b/mutt/exit.c similarity index 100% rename from lib/exit.c rename to mutt/exit.c diff --git a/lib/exit.h b/mutt/exit.h similarity index 92% rename from lib/exit.h rename to mutt/exit.h index 42845c8818c..0d46ba38442 100644 --- a/lib/exit.h +++ b/mutt/exit.h @@ -20,9 +20,9 @@ * this program. If not, see . */ -#ifndef _LIB_EXIT_H -#define _LIB_EXIT_H +#ifndef _MUTT_EXIT_H +#define _MUTT_EXIT_H void mutt_exit(int code); -#endif /* _LIB_EXIT_H */ +#endif /* _MUTT_EXIT_H */ diff --git a/lib/file.c b/mutt/file.c similarity index 99% rename from lib/file.c rename to mutt/file.c index 63cce57f328..2c1ea43b8cd 100644 --- a/lib/file.c +++ b/mutt/file.c @@ -1260,4 +1260,3 @@ int mbox_check_empty(const char *path) return ((st.st_size == 0)); } - diff --git a/lib/file.h b/mutt/file.h similarity index 97% rename from lib/file.h rename to mutt/file.h index 3a37cb21593..55eb9be521b 100644 --- a/lib/file.h +++ b/mutt/file.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _LIB_FILE_H -#define _LIB_FILE_H +#ifndef _MUTT_FILE_H +#define _MUTT_FILE_H #include #include @@ -63,4 +63,4 @@ int safe_rename(const char *src, const char *target); int safe_symlink(const char *oldpath, const char *newpath); int to_absolute_path(char *path, const char *reference); -#endif /* _LIB_FILE_H */ +#endif /* _MUTT_FILE_H */ diff --git a/lib/hash.c b/mutt/hash.c similarity index 100% rename from lib/hash.c rename to mutt/hash.c diff --git a/lib/hash.h b/mutt/hash.h similarity index 97% rename from lib/hash.h rename to mutt/hash.h index 8f1d7a17a8b..74aaffd2197 100644 --- a/lib/hash.h +++ b/mutt/hash.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _LIB_HASH_H -#define _LIB_HASH_H +#ifndef _MUTT_HASH_H +#define _MUTT_HASH_H #include @@ -84,4 +84,4 @@ struct HashWalkState struct HashElem *hash_walk(const struct Hash *table, struct HashWalkState *state); -#endif /* _LIB_HASH_H */ +#endif /* _MUTT_HASH_H */ diff --git a/lib/list.c b/mutt/list.c similarity index 99% rename from lib/list.c rename to mutt/list.c index d3488aaefad..ae4631eff32 100644 --- a/lib/list.c +++ b/mutt/list.c @@ -192,4 +192,3 @@ int strict_cmp_stailq(const struct ListHead *ah, const struct ListHead *bh) return 1; } - diff --git a/lib/list.h b/mutt/list.h similarity index 95% rename from lib/list.h rename to mutt/list.h index f1b4aee2b9c..54d3f4a9f5f 100644 --- a/lib/list.h +++ b/mutt/list.h @@ -21,12 +21,12 @@ * this program. If not, see . */ -#ifndef _LIB_LIST_H -#define _LIB_LIST_H +#ifndef _MUTT_LIST_H +#define _MUTT_LIST_H #include #include -#include "lib/queue.h" +#include "mutt/queue.h" /** * struct ListNode - A List node for strings @@ -54,4 +54,4 @@ struct ListNode *mutt_list_insert_tail(struct ListHead *h, char *s); bool mutt_list_match(const char *s, struct ListHead *h); int strict_cmp_stailq(const struct ListHead *ah, const struct ListHead *bh); -#endif /* _LIB_LIST_H */ +#endif /* _MUTT_LIST_H */ diff --git a/lib/mapping.c b/mutt/mapping.c similarity index 100% rename from lib/mapping.c rename to mutt/mapping.c diff --git a/lib/mapping.h b/mutt/mapping.h similarity index 100% rename from lib/mapping.h rename to mutt/mapping.h diff --git a/lib/mbyte.c b/mutt/mbyte.c similarity index 99% rename from lib/mbyte.c rename to mutt/mbyte.c index 84574ccc78c..8ab7c4a1a28 100644 --- a/lib/mbyte.c +++ b/mutt/mbyte.c @@ -349,4 +349,3 @@ bool is_shell_char(wchar_t ch) static const wchar_t shell_chars[] = L"<>&()$?*;{}| "; /* ! not included because it can be part of a pathname in NeoMutt */ return wcschr(shell_chars, ch) != NULL; } - diff --git a/lib/mbyte.h b/mutt/mbyte.h similarity index 96% rename from lib/mbyte.h rename to mutt/mbyte.h index afe0b1d82fc..5c710430333 100644 --- a/lib/mbyte.h +++ b/mutt/mbyte.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _LIB_MBYTE_H -#define _LIB_MBYTE_H +#ifndef _MUTT_MBYTE_H +#define _MUTT_MBYTE_H #include #include @@ -51,4 +51,4 @@ int my_wcwidth(wchar_t wc); int my_width(const char *str, int col, bool display); size_t width_ceiling(const wchar_t *s, size_t n, int w1); -#endif /* _LIB_MBYTE_H */ +#endif /* _MUTT_MBYTE_H */ diff --git a/lib/md5.c b/mutt/md5.c similarity index 100% rename from lib/md5.c rename to mutt/md5.c diff --git a/lib/md5.h b/mutt/md5.h similarity index 96% rename from lib/md5.h rename to mutt/md5.h index 7227c0f6ecf..3eb9564e32b 100644 --- a/lib/md5.h +++ b/mutt/md5.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _LIB_MD5_H -#define _LIB_MD5_H +#ifndef _MUTT_MD5_H +#define _MUTT_MD5_H #include #include @@ -53,4 +53,4 @@ void md5_process_bytes(const void *buffer, size_t len, struct Md5Ctx *ctx); void *md5_read_ctx(const struct Md5Ctx *ctx, void *resbuf); int md5_stream(FILE *stream, void *resblock); -#endif /* _LIB_MD5_H */ +#endif /* _MUTT_MD5_H */ diff --git a/lib/memory.c b/mutt/memory.c similarity index 100% rename from lib/memory.c rename to mutt/memory.c diff --git a/lib/memory.h b/mutt/memory.h similarity index 93% rename from lib/memory.h rename to mutt/memory.h index 184805873e2..52b461c15fb 100644 --- a/lib/memory.h +++ b/mutt/memory.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _LIB_MEMORY_H -#define _LIB_MEMORY_H +#ifndef _MUTT_MEMORY_H +#define _MUTT_MEMORY_H #include @@ -39,4 +39,4 @@ void safe_realloc(void *ptr, size_t size); #define FREE(x) safe_free(x) -#endif /* _LIB_MEMORY_H */ +#endif /* _MUTT_MEMORY_H */ diff --git a/lib/message.c b/mutt/message.c similarity index 100% rename from lib/message.c rename to mutt/message.c diff --git a/lib/message.h b/mutt/message.h similarity index 93% rename from lib/message.h rename to mutt/message.h index 4a9bc60fe99..d23d6bb3b06 100644 --- a/lib/message.h +++ b/mutt/message.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _LIB_MESSAGE_H -#define _LIB_MESSAGE_H +#ifndef _MUTT_MESSAGE_H +#define _MUTT_MESSAGE_H #ifdef ENABLE_NLS #include @@ -40,4 +40,4 @@ void (*mutt_error) (const char *format, ...); void (*mutt_message)(const char *format, ...); void (*mutt_perror) (const char *message); -#endif /* _LIB_MESSAGE_H */ +#endif /* _MUTT_MESSAGE_H */ diff --git a/lib/lib.h b/mutt/mutt.h similarity index 96% rename from lib/lib.h rename to mutt/mutt.h index fc529b5fd28..ee1f64fbe29 100644 --- a/lib/lib.h +++ b/mutt/mutt.h @@ -45,8 +45,8 @@ * -# @subpage string */ -#ifndef _LIB_LIB_H -#define _LIB_LIB_H +#ifndef _MUTT_MUTT_H +#define _MUTT_MUTT_H #include "base64.h" #include "buffer.h" @@ -64,4 +64,4 @@ #include "sha1.h" #include "string2.h" -#endif /* _LIB_LIB_H */ +#endif /* _MUTT_MUTT_H */ diff --git a/lib/queue.h b/mutt/queue.h similarity index 100% rename from lib/queue.h rename to mutt/queue.h diff --git a/lib/sha1.c b/mutt/sha1.c similarity index 100% rename from lib/sha1.c rename to mutt/sha1.c diff --git a/lib/sha1.h b/mutt/sha1.h similarity index 95% rename from lib/sha1.h rename to mutt/sha1.h index 8a36ac23b16..47449598b4b 100644 --- a/lib/sha1.h +++ b/mutt/sha1.h @@ -22,8 +22,8 @@ * this program. If not, see . */ -#ifndef _LIB_SHA1_H -#define _LIB_SHA1_H +#ifndef _MUTT_SHA1_H +#define _MUTT_SHA1_H #include @@ -44,4 +44,4 @@ void sha1_update(struct Sha1Ctx *context, const unsigned char *data, uint32_t le #define SHA_DIGEST_LENGTH 20 -#endif /* _LIB_SHA1_H */ +#endif /* _MUTT_SHA1_H */ diff --git a/lib/string.c b/mutt/string.c similarity index 100% rename from lib/string.c rename to mutt/string.c diff --git a/lib/string2.h b/mutt/string2.h similarity index 98% rename from lib/string2.h rename to mutt/string2.h index c7dff15a137..e3c5bf5ea3f 100644 --- a/lib/string2.h +++ b/mutt/string2.h @@ -24,8 +24,8 @@ * #include */ -#ifndef _LIB_STRING_H -#define _LIB_STRING_H +#ifndef _MUTT_STRING_H +#define _MUTT_STRING_H #include #include @@ -91,4 +91,4 @@ char * skip_email_wsp(const char *s); char * strfcpy(char *dest, const char *src, size_t dlen); char * strnfcpy(char *dest, char *src, size_t size, size_t dlen); -#endif /* _LIB_STRING_H */ +#endif /* _MUTT_STRING_H */ diff --git a/mutt_account.c b/mutt_account.c index f2a0d1c9b32..e1a80c289c1 100644 --- a/mutt_account.c +++ b/mutt_account.c @@ -23,7 +23,7 @@ #include "config.h" #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "mutt_account.h" #include "globals.h" diff --git a/mutt_curses.h b/mutt_curses.h index b0bb13d65e1..0f4f068e299 100644 --- a/mutt_curses.h +++ b/mutt_curses.h @@ -25,9 +25,9 @@ #define _MUTT_CURSES_H #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "options.h" -#include "lib/queue.h" +#include "mutt/queue.h" #ifdef USE_SLANG_CURSES diff --git a/mutt_idna.c b/mutt_idna.c index 7a956fdca5f..b5673f593d2 100644 --- a/mutt_idna.c +++ b/mutt_idna.c @@ -24,7 +24,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt_idna.h" #include "address.h" #include "charset.h" diff --git a/mutt_lua.c b/mutt_lua.c index bac8db9187a..8b2cd84f5e8 100644 --- a/mutt_lua.c +++ b/mutt_lua.c @@ -29,7 +29,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "mutt_lua.h" #include "globals.h" diff --git a/mutt_notmuch.c b/mutt_notmuch.c index 1a010b38b06..63471c8859f 100644 --- a/mutt_notmuch.c +++ b/mutt_notmuch.c @@ -46,7 +46,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "mutt_notmuch.h" #include "body.h" diff --git a/mutt_socket.c b/mutt_socket.c index 6e74ad36531..53b67ce1a65 100644 --- a/mutt_socket.c +++ b/mutt_socket.c @@ -23,8 +23,8 @@ #include "config.h" #include #include -#include "lib/lib.h" -#include "lib/queue.h" +#include "mutt/mutt.h" +#include "mutt/queue.h" #include "conn/conn.h" #include "mutt_socket.h" #include "globals.h" diff --git a/mutt_socket.h b/mutt_socket.h index ed3ff4ea8d3..f536554abfd 100644 --- a/mutt_socket.h +++ b/mutt_socket.h @@ -23,7 +23,7 @@ #ifndef _MUTT_SOCKET_H #define _MUTT_SOCKET_H -#include "lib/queue.h" +#include "mutt/queue.h" #include "conn/conn.h" struct Account; diff --git a/mutt_tags.c b/mutt_tags.c index 000dd1c2cc6..fcac4d3a5b6 100644 --- a/mutt_tags.c +++ b/mutt_tags.c @@ -23,9 +23,9 @@ #include #include "config.h" -#include "lib/hash.h" -#include "lib/queue.h" -#include "lib/string2.h" +#include "mutt/hash.h" +#include "mutt/queue.h" +#include "mutt/string2.h" #include "globals.h" #include "mutt_tags.h" diff --git a/mutt_tags.h b/mutt_tags.h index 02d483fd460..cca9f811c21 100644 --- a/mutt_tags.h +++ b/mutt_tags.h @@ -25,7 +25,7 @@ #include #include -#include "lib/queue.h" +#include "mutt/queue.h" /** * struct TagNode - LinkedList Tag Element diff --git a/muttlib.c b/muttlib.c index ed5ac8364ed..c7c33a8f020 100644 --- a/muttlib.c +++ b/muttlib.c @@ -43,7 +43,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "alias.h" diff --git a/mx.c b/mx.c index 1a42caa74fc..5f66bde32c1 100644 --- a/mx.c +++ b/mx.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "mx.h" #include "address.h" diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c index fd4a8042bac..87b8580e114 100644 --- a/ncrypt/crypt.c +++ b/ncrypt/crypt.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "alias.h" diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index 4d7f4994f3d..3a4c875d76e 100644 --- a/ncrypt/crypt_gpgme.c +++ b/ncrypt/crypt_gpgme.c @@ -45,7 +45,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "alias.h" diff --git a/ncrypt/crypt_mod.c b/ncrypt/crypt_mod.c index f809b24793b..940ab4b1cc1 100644 --- a/ncrypt/crypt_mod.c +++ b/ncrypt/crypt_mod.c @@ -21,8 +21,8 @@ */ #include "config.h" -#include "lib/lib.h" -#include "lib/queue.h" +#include "mutt/mutt.h" +#include "mutt/queue.h" #include "crypt_mod.h" /** diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c index fa729d87430..c22c9a1cf6a 100644 --- a/ncrypt/cryptglue.c +++ b/ncrypt/cryptglue.c @@ -34,7 +34,7 @@ #include "config.h" #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "crypt_mod.h" #include "globals.h" #include "ncrypt.h" diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c index a781c3f6ea2..93f49ce41fb 100644 --- a/ncrypt/gnupgparse.c +++ b/ncrypt/gnupgparse.c @@ -38,7 +38,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "charset.h" #include "filter.h" diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c index 942aeb78655..55e3d4eab46 100644 --- a/ncrypt/pgp.c +++ b/ncrypt/pgp.c @@ -43,7 +43,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "body.h" diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c index 30c6f7a1d4c..45c39cff043 100644 --- a/ncrypt/pgpinvoke.c +++ b/ncrypt/pgpinvoke.c @@ -30,7 +30,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "address.h" #include "filter.h" #include "format_flags.h" diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c index bc2c56bef4c..ff4a7782685 100644 --- a/ncrypt/pgpkey.c +++ b/ncrypt/pgpkey.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "pgpkey.h" #include "address.h" diff --git a/ncrypt/pgplib.c b/ncrypt/pgplib.c index e0ebf35cd77..a3b7e03b4d0 100644 --- a/ncrypt/pgplib.c +++ b/ncrypt/pgplib.c @@ -24,7 +24,7 @@ #include "config.h" #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "pgplib.h" const char *pgp_pkalgbytype(unsigned char type) diff --git a/ncrypt/pgplib.h b/ncrypt/pgplib.h index b58e26e6a38..1d198b72243 100644 --- a/ncrypt/pgplib.h +++ b/ncrypt/pgplib.h @@ -28,7 +28,7 @@ #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" /** * struct PgpSignature - PGP Signature diff --git a/ncrypt/pgpmicalg.c b/ncrypt/pgpmicalg.c index aa91687a49b..6aa01a464ab 100644 --- a/ncrypt/pgpmicalg.c +++ b/ncrypt/pgpmicalg.c @@ -31,7 +31,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "pgppacket.h" #include "protos.h" diff --git a/ncrypt/pgppacket.c b/ncrypt/pgppacket.c index c741d7506fb..110ffa23a6c 100644 --- a/ncrypt/pgppacket.c +++ b/ncrypt/pgppacket.c @@ -24,7 +24,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #define CHUNKSIZE 1024 diff --git a/ncrypt/smime.c b/ncrypt/smime.c index 41f0d912d17..42457f88b13 100644 --- a/ncrypt/smime.c +++ b/ncrypt/smime.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "alias.h" diff --git a/newsrc.c b/newsrc.c index ce8925ac1b4..ee1c16ccea3 100644 --- a/newsrc.c +++ b/newsrc.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "bcache.h" diff --git a/nntp.c b/nntp.c index 8648ec5f7c6..9c5cd5c21eb 100644 --- a/nntp.c +++ b/nntp.c @@ -27,7 +27,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "nntp.h" diff --git a/pager.c b/pager.c index c3c3bfeb3aa..8fc7474eca8 100644 --- a/pager.c +++ b/pager.c @@ -35,7 +35,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "alias.h" #include "attach.h" diff --git a/parameter.h b/parameter.h index d5d6e45cd49..f37f1c49ec1 100644 --- a/parameter.h +++ b/parameter.h @@ -23,7 +23,7 @@ #ifndef _MUTT_PARAMETER_H #define _MUTT_PARAMETER_H -#include "lib/lib.h" +#include "mutt/mutt.h" /** * struct Parameter - Attribute associated with a MIME part diff --git a/parse.c b/parse.c index ce7c8ffaa44..3cc119c2e69 100644 --- a/parse.c +++ b/parse.c @@ -28,7 +28,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "body.h" #include "charset.h" diff --git a/pattern.c b/pattern.c index f70d9e59d17..0815f6cccb9 100644 --- a/pattern.c +++ b/pattern.c @@ -38,7 +38,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "body.h" diff --git a/pattern.h b/pattern.h index 7e64e36f4dc..114bb8c3632 100644 --- a/pattern.h +++ b/pattern.h @@ -26,7 +26,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" struct Address; struct Buffer; diff --git a/pgppubring.c b/pgppubring.c index dce20b96eb6..2b34c111527 100644 --- a/pgppubring.c +++ b/pgppubring.c @@ -42,7 +42,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "ncrypt/ncrypt.h" #include "ncrypt/pgplib.h" #include "ncrypt/pgppacket.h" diff --git a/pop.c b/pop.c index 76b8a9850b4..620b46ab3eb 100644 --- a/pop.c +++ b/pop.c @@ -28,7 +28,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "pop.h" diff --git a/pop_auth.c b/pop_auth.c index 42478d07525..7856b7bb8d0 100644 --- a/pop_auth.c +++ b/pop_auth.c @@ -24,7 +24,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "globals.h" diff --git a/pop_lib.c b/pop_lib.c index 7fc5fd1de91..01a36cf4557 100644 --- a/pop_lib.c +++ b/pop_lib.c @@ -28,7 +28,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "context.h" diff --git a/postpone.c b/postpone.c index f81330129d7..7c1ee8baf5d 100644 --- a/postpone.c +++ b/postpone.c @@ -29,7 +29,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "body.h" #include "context.h" diff --git a/query.c b/query.c index ca133847350..59e2cc81cb8 100644 --- a/query.c +++ b/query.c @@ -30,7 +30,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "alias.h" diff --git a/recvattach.c b/recvattach.c index 0bcd068bb02..2b3d7a45485 100644 --- a/recvattach.c +++ b/recvattach.c @@ -31,7 +31,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "attach.h" #include "body.h" diff --git a/recvcmd.c b/recvcmd.c index c3587d48ad8..babafcf563c 100644 --- a/recvcmd.c +++ b/recvcmd.c @@ -25,7 +25,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "alias.h" #include "attach.h" diff --git a/remailer.c b/remailer.c index d925562f7d9..a7b3ae5a9aa 100644 --- a/remailer.c +++ b/remailer.c @@ -30,7 +30,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "remailer.h" #include "address.h" diff --git a/resize.c b/resize.c index a343ed05e2a..f1de053d3b3 100644 --- a/resize.c +++ b/resize.c @@ -26,7 +26,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt_curses.h" #ifdef HAVE_SYS_IOCTL_H #include diff --git a/rfc1524.c b/rfc1524.c index 5bae77504d4..ab2b3fe0f30 100644 --- a/rfc1524.c +++ b/rfc1524.c @@ -35,7 +35,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "rfc1524.h" #include "body.h" diff --git a/rfc2047.c b/rfc2047.c index c41a991bd1f..039affe8ce0 100644 --- a/rfc2047.c +++ b/rfc2047.c @@ -26,7 +26,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "rfc2047.h" #include "address.h" #include "charset.h" diff --git a/rfc2231.c b/rfc2231.c index b7a0808878d..ed23aa573de 100644 --- a/rfc2231.c +++ b/rfc2231.c @@ -34,7 +34,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "rfc2231.h" #include "charset.h" #include "globals.h" diff --git a/rfc3676.c b/rfc3676.c index dac8cbe40b3..8c42f15456b 100644 --- a/rfc3676.c +++ b/rfc3676.c @@ -29,7 +29,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "body.h" #include "globals.h" diff --git a/rfc822.c b/rfc822.c index dd4c2e6c725..3d604c0e824 100644 --- a/rfc822.c +++ b/rfc822.c @@ -53,7 +53,7 @@ #include "config.h" #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "rfc822.h" #include "mutt_idna.h" diff --git a/rfc822.h b/rfc822.h index 55e6bd3ab74..cc63232ddd2 100644 --- a/rfc822.h +++ b/rfc822.h @@ -27,7 +27,7 @@ #include #include #include "address.h" -#include "lib/lib.h" +#include "mutt/mutt.h" /** * enum AddressError - possible values for RFC822Error diff --git a/safe_asprintf.c b/safe_asprintf.c index 77d11080474..f9e35ef7cd5 100644 --- a/safe_asprintf.c +++ b/safe_asprintf.c @@ -22,7 +22,7 @@ #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" /* NOTE: Currently there is no check in configure.ac for vasprintf(3). the * undefined behavior of the error condition makes it difficult to write a safe diff --git a/score.c b/score.c index 44f501d8cf0..c9b5db88cba 100644 --- a/score.c +++ b/score.c @@ -23,7 +23,7 @@ #include "config.h" #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "context.h" #include "globals.h" diff --git a/send.c b/send.c index 7f7a1351cce..c18b4ad8bd6 100644 --- a/send.c +++ b/send.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "alias.h" diff --git a/sendlib.c b/sendlib.c index ec00ad4d1e7..fa299755150 100644 --- a/sendlib.c +++ b/sendlib.c @@ -38,7 +38,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "address.h" #include "body.h" diff --git a/sidebar.c b/sidebar.c index 3eda364afcf..3681e51a60e 100644 --- a/sidebar.c +++ b/sidebar.c @@ -28,7 +28,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "sidebar.h" #include "buffy.h" diff --git a/signal.c b/signal.c index e6fb4164194..0f5ebb302de 100644 --- a/signal.c +++ b/signal.c @@ -26,7 +26,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "globals.h" #include "mutt_curses.h" #include "options.h" diff --git a/smtp.c b/smtp.c index d308b3940f5..e4aa274608e 100644 --- a/smtp.c +++ b/smtp.c @@ -31,7 +31,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" #include "address.h" diff --git a/sort.c b/sort.c index 2ebb10a06b5..e51a4c6be20 100644 --- a/sort.c +++ b/sort.c @@ -23,7 +23,7 @@ #include "config.h" #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "sort.h" #include "address.h" diff --git a/sort.h b/sort.h index 6b3a62295d5..18c66a7210e 100644 --- a/sort.h +++ b/sort.h @@ -24,7 +24,7 @@ #define _MUTT_SORT_H #include "where.h" -#include "lib/mapping.h" +#include "mutt/mapping.h" struct Address; struct Context; diff --git a/status.c b/status.c index 480a8174675..10f77d1047b 100644 --- a/status.c +++ b/status.c @@ -22,7 +22,7 @@ #include "config.h" #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "context.h" #include "format_flags.h" #include "globals.h" diff --git a/thread.c b/thread.c index 41bdfaceebb..fad10c8feaf 100644 --- a/thread.c +++ b/thread.c @@ -25,7 +25,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "thread.h" #include "body.h" diff --git a/url.c b/url.c index 87c0451e69f..a9056500801 100644 --- a/url.c +++ b/url.c @@ -28,7 +28,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #include "mutt.h" #include "url.h" #include "envelope.h" diff --git a/url.h b/url.h index 2c1051d10fd..7cebe6768da 100644 --- a/url.h +++ b/url.h @@ -22,7 +22,7 @@ #define _MUTT_URL_H #include -#include "lib/queue.h" +#include "mutt/queue.h" struct Envelope; diff --git a/version.c b/version.c index a46668fe2c0..e3a2f3044a4 100644 --- a/version.c +++ b/version.c @@ -28,7 +28,7 @@ #include #include #include -#include "lib/lib.h" +#include "mutt/mutt.h" #ifdef HAVE_STRINGPREP_H #include #elif defined(HAVE_IDN_STRINGPREP_H)