# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-
-#include "mutt.h"
-#include "mx.h"
-#include "mh.h"
-#include "mbox.h"
-#include "copy.h"
-#include "buffy.h"
-#include "sort.h"
-#include "thread.h"
-#include "hcache.h"
-
-#include "lib/debug.h"
-
#include <sys/stat.h>
#include <sys/types.h>
#include <dirent.h>
#include <sys/time.h>
#endif
+#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 "mutt.h"
+#include "mx.h"
+#include "mh.h"
+#include "mbox.h"
+#include "copy.h"
+#include "buffy.h"
+#include "sort.h"
+#include "thread.h"
+#include "hcache.h"
+
struct maildir {
HEADER *h;
char *canon_fname;
int line = 1;
char *buff = NULL;
char *t;
- size_t sz = 0;
+ ssize_t sz = 0;
short f;
int first, last;
char *tmpfname;
char *buff = NULL;
char *p;
- size_t s;
+ ssize_t s;
int l = 0;
int i;
char *buff = NULL;
int line;
- size_t sz;
+ ssize_t sz;
if (mh_mkstemp (ctx, &nfp, &tmpfname) == -1)
return;
}
#ifdef USE_HCACHE
-static size_t maildir_hcache_keylen (const char *fn)
+static ssize_t maildir_hcache_keylen (const char *fn)
{
- const char *p = strchr (fn, ':');
-
- return p ? (size_t) (p - fn) : m_strlen(fn);
+ return m_strchrnul(fn, ':') - fn;
}
#endif
return (int) (*((const char *) a) - *((const char *) b));
}
-static void maildir_flags (char *dest, size_t destlen, HEADER * hdr)
+static void maildir_flags (char *dest, ssize_t destlen, HEADER * hdr)
{
*dest = '\0';
return -1;
}
-static char *maildir_canon_filename (char *dest, const char *src, size_t l)
+static char *maildir_canon_filename (char *dest, const char *src, ssize_t l)
{
char *t, *u;