emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu-maildir: improve error handling / reporting

This commit is contained in:
Dirk-Jan C. Binnema 2022-10-30 11:27:54 +02:00
parent dbb83aaab7
commit 81bc10ebf9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mu-maildir.cc
View File

@ -296,7 +296,7 @@ msg_move_g_file(const std::string& src, const std::string& dst)
if (res) if (res)
return Ok(); return Ok();
else else
return Err(Error{Error::Code::File, &err, return Err(Error{Error::Code::File, &err/*consumed*/,
"error moving %s -> %s", "error moving %s -> %s",
src.c_str(), dst.c_str()}); src.c_str(), dst.c_str()});
} }
@ -313,15 +313,15 @@ msg_move(const std::string& src, const std::string& dst, bool force_gio)
return msg_move_verify(src, dst); return msg_move_verify(src, dst);
if (errno != EXDEV) /* some unrecoverable error occurred */ if (errno != EXDEV) /* some unrecoverable error occurred */
return Err(Error{Error::Code::File, "error moving %s -> %s", return Err(Error{Error::Code::File, "error moving %s -> %s: %s",
src.c_str(), dst.c_str()}); src.c_str(), dst.c_str(), strerror(errno)});
} }
/* the EXDEV / force-gio case -- source and target live on different /* the EXDEV / force-gio case -- source and target live on different
* filesystems */ * filesystems */
if (!msg_move_g_file(src, dst)) auto res = msg_move_g_file(src, dst);
return Err(Error{Error::Code::File, "error moving %s -> %s", if (!res)
src.c_str(), dst.c_str()}); return res;
else else
return msg_move_verify(src, dst); return msg_move_verify(src, dst);
} }