# include "config.h"
#endif
+#include <string.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
#include "keymap.h"
#include "url.h"
#include "mutt_idna.h"
#include "xterm.h"
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
-
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
"+HAVE_REGCOMP "
#else
"-HAVE_REGCOMP "
-#endif
-#ifdef USE_GNU_REGEX
- "+USE_GNU_REGEX "
-#else
- "-USE_GNU_REGEX "
#endif
"\n "
#ifdef HAVE_COLOR
SRAND (time (NULL));
umask (077);
- p_clear(Options, sizeof(Options));
- p_clear(QuadOptions, sizeof(QuadOptions));
+ p_clear(Options, countof(Options));
+ p_clear(QuadOptions, countof(QuadOptions));
#ifdef USE_NNTP
while ((i =