rename lib to mutt

royger · Nov 16, 2017 · b8bff4f · b8bff4f
1 parent 5319db3
commit b8bff4f
Show file tree

Hide file tree

Showing 171 changed files with 231 additions and 238 deletions.
diff --git 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
@@ -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
@@ -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
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#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
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <wchar.h>
 #include <wctype.h>
-#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
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#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
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#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
@@ -24,9 +24,9 @@
 #include <limits.h>
 #include <string.h>
 #include <unistd.h>
-#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
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#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
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <utime.h>
-#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
@@ -27,7 +27,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#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
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#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
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#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
@@ -26,7 +26,7 @@
 #include <limits.h>
 #include <string.h>
 #include <sys/stat.h>
-#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
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#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
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#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
@@ -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
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#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
@@ -36,9 +36,9 @@
 #include <sys/socket.h>
 #include <time.h>
 #include <unistd.h>
-#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
@@ -53,10 +53,10 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <time.h>
-#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
@@ -32,8 +32,8 @@
 
 #include "config.h"
 #include <stdio.h>
-#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
@@ -57,10 +57,10 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
-#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
@@ -52,11 +52,11 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#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
@@ -42,12 +42,12 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
-#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
@@ -41,9 +41,9 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#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
@@ -25,7 +25,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <string.h>
-#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
@@ -41,7 +41,7 @@
 #include <termios.h>
 #include <unistd.h>
 #include <wchar.h>
-#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
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#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
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#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
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#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
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <wchar.h>
 #include <wctype.h>
-#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
@@ -24,7 +24,7 @@
 #define _MUTT_ENTER_STATE_H
 
 #include <stddef.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 
 /**
  * struct EnterState - Keep our place when entering a string