projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more charset improvements.
[apps/madmutt.git]
/
mh.c
diff --git
a/mh.c
b/mh.c
index
f108bf9
..
49302fc
100644
(file)
--- a/
mh.c
+++ b/
mh.c
@@
-17,23
+17,6
@@
# include "config.h"
#endif
# 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/stat.h>
#include <sys/types.h>
#include <dirent.h>
@@
-52,6
+35,21
@@
#include <sys/time.h>
#endif
#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 "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;
struct maildir {
HEADER *h;
char *canon_fname;
@@
-142,7
+140,7
@@
static void mh_read_sequences (struct mh_sequences *mhs, const char *path)
int line = 1;
char *buff = NULL;
char *t;
int line = 1;
char *buff = NULL;
char *t;
- size_t sz = 0;
+ s
s
ize_t sz = 0;
short f;
int first, last;
short f;
int first, last;
@@
-273,7
+271,7
@@
void mh_update_sequences (CONTEXT * ctx)
char *tmpfname;
char *buff = NULL;
char *p;
char *tmpfname;
char *buff = NULL;
char *p;
- size_t s;
+ s
s
ize_t s;
int l = 0;
int i;
int l = 0;
int i;
@@
-384,7
+382,7
@@
static void mh_sequences_add_one (CONTEXT * ctx, int n, short unseen,
char *buff = NULL;
int line;
char *buff = NULL;
int line;
- size_t sz;
+ s
s
ize_t sz;
if (mh_mkstemp (ctx, &nfp, &tmpfname) == -1)
return;
if (mh_mkstemp (ctx, &nfp, &tmpfname) == -1)
return;
@@
-697,7
+695,6
@@
static int maildir_parse_dir (CONTEXT * ctx, struct maildir ***last,
/* FOO - really ignore the return value? */
/* FOO - really ignore the return value? */
- debug_print (2, ("parsing %s\n", de->d_name));
maildir_parse_entry (ctx, last, subdir, de->d_name, count, is_old,
#if HAVE_DIRENT_D_INO
de->d_ino
maildir_parse_entry (ctx, last, subdir, de->d_name, count, is_old,
#if HAVE_DIRENT_D_INO
de->d_ino
@@
-717,12
+714,7
@@
static int maildir_add_to_context (CONTEXT * ctx, struct maildir *md)
while (md) {
while (md) {
- debug_print (2, ("considering %s\n", NONULL (md->canon_fname)));
-
if (md->h) {
if (md->h) {
- debug_print (2, ("flags: %s%s%s%s%s\n", md->h->flagged ? "f" : "",
- md->h->deleted ? "D" : "", md->h->replied ? "r" : "",
- md->h->old ? "O" : "", md->h->read ? "R" : ""));
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
@@
-755,11
+747,9
@@
static int maildir_move_to_context (CONTEXT * ctx, struct maildir **md)
}
#ifdef USE_HCACHE
}
#ifdef USE_HCACHE
-static size_t maildir_hcache_keylen (const char *fn)
+static s
s
ize_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
}
#endif
@@
-897,7
+887,7
@@
int ch_compar (const void *a, const void *b)
return (int) (*((const char *) a) - *((const char *) b));
}
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, s
s
ize_t destlen, HEADER * hdr)
{
*dest = '\0';
{
*dest = '\0';
@@
-964,17
+954,13
@@
static int maildir_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr
dest->path, subdir, (long) time (NULL),
(unsigned int) getpid (), Counter++, NONULL (Hostname), suffix);
dest->path, subdir, (long) time (NULL),
(unsigned int) getpid (), Counter++, NONULL (Hostname), suffix);
- debug_print (2, ("trying %s.\n", path));
-
umask (Umask);
if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) {
if (errno != EEXIST) {
mutt_perror (path);
return -1;
}
umask (Umask);
if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) {
if (errno != EEXIST) {
mutt_perror (path);
return -1;
}
- }
- else {
- debug_print (2, ("success.\n"));
+ } else {
msg->path = m_strdup(path);
break;
}
msg->path = m_strdup(path);
break;
}
@@
-1041,8
+1027,6
@@
static int maildir_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr)
NONULL (Hostname), suffix);
snprintf (full, _POSIX_PATH_MAX, "%s/%s", ctx->path, path);
NONULL (Hostname), suffix);
snprintf (full, _POSIX_PATH_MAX, "%s/%s", ctx->path, path);
- debug_print (2, ("renaming %s to %s.\n", msg->path, full));
-
if (safe_rename (msg->path, full) == 0) {
if (hdr)
m_strreplace(&hdr->path, path);
if (safe_rename (msg->path, full) == 0) {
if (hdr)
m_strreplace(&hdr->path, path);
@@
-1259,7
+1243,6
@@
static int maildir_sync_message (CONTEXT * ctx, int msgno)
char *p;
if ((p = strrchr (h->path, '/')) == NULL) {
char *p;
if ((p = strrchr (h->path, '/')) == NULL) {
- debug_print (1, ("%s: unable to find subdir!\n", h->path));
return (-1);
}
p++;
return (-1);
}
p++;
@@
-1386,7
+1369,7
@@
err:
return -1;
}
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, s
s
ize_t l)
{
char *t, *u;
{
char *t, *u;