From c223f858b7d8ad4e651615042bd40afe511a171a Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Thu, 22 Oct 2020 20:16:41 +0300 Subject: [PATCH] mu4e: Add some extra logging to the mu-maildir --- lib/mu-maildir.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/mu-maildir.c b/lib/mu-maildir.c index a6bb9a33..9c14b3d0 100644 --- a/lib/mu-maildir.c +++ b/lib/mu-maildir.c @@ -897,11 +897,18 @@ msg_move_check_post (const char *src, const char *dst, GError **err) /* double check -- is the target really there? */ if (access (dst, F_OK) != 0) return mu_util_g_set_error - (err, MU_ERROR_FILE, "can't find target (%s)", dst); + (err, MU_ERROR_FILE, "can't find target (%s->%s)", src, dst); + + if (access (src, F_OK) == 0) { + if (g_strcmp0(src, dst) == 0) { + g_warning ("moved %s to itself", src); + return TRUE; + } - if (access (src, F_OK) == 0) return mu_util_g_set_error - (err, MU_ERROR_FILE, "source still there (%s)", src); + (err, MU_ERROR_FILE, "source still there (%s->%s)", + src, dst); + } return TRUE; } @@ -937,7 +944,7 @@ msg_move (const char* src, const char *dst, GError **err) if (errno != EXDEV) /* some unrecoverable error occurred */ return mu_util_g_set_error - (err, MU_ERROR_FILE,"error moving %s to %s", src, dst); + (err, MU_ERROR_FILE, "error moving %s -> %s", src, dst); /* he EXDEV case -- source and target live on different filesystems */ return msg_move_g_file (src, dst, err);