clang-format: update c/cc coding style
Update all cc code using .clang-format; please do so as well for future PRs etc.; emacs has a handy 'clang-format' mode to make this automatic. For comparing old changes with git blame, we can disregard this one using --ignore-rev (see https://www.moxio.com/blog/43/ignoring-bulk-change-commits-with-git-blame )
This commit is contained in:
Dirk-Jan C. Binnema
@ -35,8 +35,8 @@
|
||||
|
||||
using namespace Mu;
|
||||
|
||||
#define MU_MAILDIR_NOINDEX_FILE ".noindex"
|
||||
#define MU_MAILDIR_NOUPDATE_FILE ".noupdate"
|
||||
#define MU_MAILDIR_NOINDEX_FILE ".noindex"
|
||||
#define MU_MAILDIR_NOUPDATE_FILE ".noupdate"
|
||||
|
||||
/* On Linux (and some BSD), we have entry->d_type, but some file
|
||||
* systems (XFS, ReiserFS) do not support it, and set it DT_UNKNOWN.
|
||||
@ -45,7 +45,7 @@ using namespace Mu;
|
||||
* and return it in the d_type parameter
|
||||
*/
|
||||
static unsigned char
|
||||
get_dtype (struct dirent* dentry, const char *path, gboolean use_lstat)
|
||||
get_dtype(struct dirent* dentry, const char* path, gboolean use_lstat)
|
||||
{
|
||||
#ifdef HAVE_STRUCT_DIRENT_D_TYPE
|
||||
|
||||
@ -58,73 +58,74 @@ get_dtype (struct dirent* dentry, const char *path, gboolean use_lstat)
|
||||
|
||||
slowpath:
|
||||
#endif /*HAVE_STRUCT_DIRENT_D_TYPE*/
|
||||
return mu_util_get_dtype (path, use_lstat);
|
||||
return mu_util_get_dtype(path, use_lstat);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
create_maildir (const char *path, mode_t mode, GError **err)
|
||||
create_maildir(const char* path, mode_t mode, GError** err)
|
||||
{
|
||||
int i;
|
||||
int i;
|
||||
const char* subdirs[] = {"new", "cur", "tmp"};
|
||||
|
||||
for (i = 0; i != G_N_ELEMENTS(subdirs); ++i) {
|
||||
|
||||
const char *fullpath;
|
||||
int rv;
|
||||
const char* fullpath;
|
||||
int rv;
|
||||
|
||||
/* static buffer */
|
||||
fullpath = mu_str_fullpath_s (path, subdirs[i]);
|
||||
fullpath = mu_str_fullpath_s(path, subdirs[i]);
|
||||
|
||||
/* if subdir already exists, don't try to re-create
|
||||
* it */
|
||||
if (mu_util_check_dir (fullpath, TRUE, TRUE))
|
||||
if (mu_util_check_dir(fullpath, TRUE, TRUE))
|
||||
continue;
|
||||
|
||||
rv = g_mkdir_with_parents (fullpath, (int)mode);
|
||||
rv = g_mkdir_with_parents(fullpath, (int)mode);
|
||||
|
||||
/* note, g_mkdir_with_parents won't detect an error if
|
||||
* there's already such a dir, but with the wrong
|
||||
* permissions; so we need to check */
|
||||
if (rv != 0 || !mu_util_check_dir(fullpath, TRUE, TRUE))
|
||||
return mu_util_g_set_error
|
||||
(err,MU_ERROR_FILE_CANNOT_MKDIR,
|
||||
"creating dir failed for %s: %s",
|
||||
fullpath, g_strerror (errno));
|
||||
return mu_util_g_set_error(err,
|
||||
MU_ERROR_FILE_CANNOT_MKDIR,
|
||||
"creating dir failed for %s: %s",
|
||||
fullpath,
|
||||
g_strerror(errno));
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
create_noindex (const char *path, GError **err)
|
||||
create_noindex(const char* path, GError** err)
|
||||
{
|
||||
/* create a noindex file if requested */
|
||||
int fd;
|
||||
const char *noindexpath;
|
||||
int fd;
|
||||
const char* noindexpath;
|
||||
|
||||
/* static buffer */
|
||||
noindexpath = mu_str_fullpath_s (path, MU_MAILDIR_NOINDEX_FILE);
|
||||
noindexpath = mu_str_fullpath_s(path, MU_MAILDIR_NOINDEX_FILE);
|
||||
|
||||
fd = creat (noindexpath, 0644);
|
||||
fd = creat(noindexpath, 0644);
|
||||
|
||||
/* note, if the 'close' failed, creation may still have
|
||||
* succeeded...*/
|
||||
if (fd < 0 || close (fd) != 0)
|
||||
return mu_util_g_set_error (err, MU_ERROR_FILE_CANNOT_CREATE,
|
||||
"error in create_noindex: %s",
|
||||
g_strerror (errno));
|
||||
if (fd < 0 || close(fd) != 0)
|
||||
return mu_util_g_set_error(err,
|
||||
MU_ERROR_FILE_CANNOT_CREATE,
|
||||
"error in create_noindex: %s",
|
||||
g_strerror(errno));
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
Mu::mu_maildir_mkdir (const char* path, mode_t mode, gboolean noindex, GError **err)
|
||||
Mu::mu_maildir_mkdir(const char* path, mode_t mode, gboolean noindex, GError** err)
|
||||
{
|
||||
g_return_val_if_fail (path, FALSE);
|
||||
g_return_val_if_fail(path, FALSE);
|
||||
|
||||
if (!create_maildir (path, mode, err))
|
||||
if (!create_maildir(path, mode, err))
|
||||
return FALSE;
|
||||
|
||||
if (noindex && !create_noindex (path, err))
|
||||
if (noindex && !create_noindex(path, err))
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
@ -133,93 +134,93 @@ Mu::mu_maildir_mkdir (const char* path, mode_t mode, gboolean noindex, GError **
|
||||
/* determine whether the source message is in 'new' or in 'cur';
|
||||
* we ignore messages in 'tmp' for obvious reasons */
|
||||
static gboolean
|
||||
check_subdir (const char *src, gboolean *in_cur, GError **err)
|
||||
check_subdir(const char* src, gboolean* in_cur, GError** err)
|
||||
{
|
||||
gboolean rv;
|
||||
char *srcpath;
|
||||
char* srcpath;
|
||||
|
||||
srcpath = g_path_get_dirname (src);
|
||||
srcpath = g_path_get_dirname(src);
|
||||
*in_cur = FALSE;
|
||||
rv = TRUE;
|
||||
rv = TRUE;
|
||||
|
||||
if (g_str_has_suffix (srcpath, "cur"))
|
||||
if (g_str_has_suffix(srcpath, "cur"))
|
||||
*in_cur = TRUE;
|
||||
else if (!g_str_has_suffix (srcpath, "new"))
|
||||
rv = mu_util_g_set_error (err,
|
||||
MU_ERROR_FILE_INVALID_SOURCE,
|
||||
"invalid source message '%s'",
|
||||
src);
|
||||
g_free (srcpath);
|
||||
else if (!g_str_has_suffix(srcpath, "new"))
|
||||
rv = mu_util_g_set_error(err,
|
||||
MU_ERROR_FILE_INVALID_SOURCE,
|
||||
"invalid source message '%s'",
|
||||
src);
|
||||
g_free(srcpath);
|
||||
return rv;
|
||||
}
|
||||
|
||||
static char*
|
||||
get_target_fullpath (const char* src, const char *targetpath, GError **err)
|
||||
get_target_fullpath(const char* src, const char* targetpath, GError** err)
|
||||
{
|
||||
char *targetfullpath, *srcfile;
|
||||
char * targetfullpath, *srcfile;
|
||||
gboolean in_cur;
|
||||
|
||||
if (!check_subdir (src, &in_cur, err))
|
||||
if (!check_subdir(src, &in_cur, err))
|
||||
return NULL;
|
||||
|
||||
srcfile = g_path_get_basename (src);
|
||||
srcfile = g_path_get_basename(src);
|
||||
|
||||
/* create targetpath; note: make the filename *cough* unique
|
||||
* by including a hash of the srcname in the targetname. This
|
||||
* helps if there are copies of a message (which all have the
|
||||
* same basename)
|
||||
*/
|
||||
targetfullpath = g_strdup_printf ("%s%c%s%c%u_%s",
|
||||
targetpath,
|
||||
G_DIR_SEPARATOR,
|
||||
in_cur ? "cur" : "new",
|
||||
G_DIR_SEPARATOR,
|
||||
g_str_hash(src),
|
||||
srcfile);
|
||||
g_free (srcfile);
|
||||
targetfullpath = g_strdup_printf("%s%c%s%c%u_%s",
|
||||
targetpath,
|
||||
G_DIR_SEPARATOR,
|
||||
in_cur ? "cur" : "new",
|
||||
G_DIR_SEPARATOR,
|
||||
g_str_hash(src),
|
||||
srcfile);
|
||||
g_free(srcfile);
|
||||
|
||||
return targetfullpath;
|
||||
}
|
||||
|
||||
|
||||
gboolean
|
||||
Mu::mu_maildir_link (const char* src, const char *targetpath, GError **err)
|
||||
Mu::mu_maildir_link(const char* src, const char* targetpath, GError** err)
|
||||
{
|
||||
char *targetfullpath;
|
||||
int rv;
|
||||
char* targetfullpath;
|
||||
int rv;
|
||||
|
||||
g_return_val_if_fail (src, FALSE);
|
||||
g_return_val_if_fail (targetpath, FALSE);
|
||||
g_return_val_if_fail(src, FALSE);
|
||||
g_return_val_if_fail(targetpath, FALSE);
|
||||
|
||||
targetfullpath = get_target_fullpath (src, targetpath, err);
|
||||
targetfullpath = get_target_fullpath(src, targetpath, err);
|
||||
if (!targetfullpath)
|
||||
return FALSE;
|
||||
|
||||
rv = symlink (src, targetfullpath);
|
||||
rv = symlink(src, targetfullpath);
|
||||
|
||||
if (rv != 0)
|
||||
mu_util_g_set_error (err, MU_ERROR_FILE_CANNOT_LINK,
|
||||
"error creating link %s => %s: %s",
|
||||
targetfullpath, src, g_strerror (errno));
|
||||
g_free (targetfullpath);
|
||||
mu_util_g_set_error(err,
|
||||
MU_ERROR_FILE_CANNOT_LINK,
|
||||
"error creating link %s => %s: %s",
|
||||
targetfullpath,
|
||||
src,
|
||||
g_strerror(errno));
|
||||
g_free(targetfullpath);
|
||||
|
||||
return rv == 0 ? TRUE: FALSE;
|
||||
return rv == 0 ? TRUE : FALSE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* determine if path is a maildir leaf-dir; ie. if it's 'cur' or 'new'
|
||||
* (we're skipping 'tmp' for obvious reasons)
|
||||
*/
|
||||
gboolean
|
||||
Mu::mu_maildir_is_leaf_dir (const char *path)
|
||||
Mu::mu_maildir_is_leaf_dir(const char* path)
|
||||
{
|
||||
size_t len;
|
||||
|
||||
/* path is the full path; it cannot possibly be shorter
|
||||
* than 4 for a maildir (/cur or /new) */
|
||||
len = path ? strlen (path) : 0;
|
||||
len = path ? strlen(path) : 0;
|
||||
if (G_UNLIKELY(len < 4))
|
||||
return FALSE;
|
||||
|
||||
@ -227,97 +228,93 @@ Mu::mu_maildir_is_leaf_dir (const char *path)
|
||||
* integer and compare that -- need to think about alignment,
|
||||
* endianness */
|
||||
|
||||
if (path[len - 4] == G_DIR_SEPARATOR &&
|
||||
path[len - 3] == 'c' &&
|
||||
path[len - 2] == 'u' &&
|
||||
if (path[len - 4] == G_DIR_SEPARATOR && path[len - 3] == 'c' && path[len - 2] == 'u' &&
|
||||
path[len - 1] == 'r')
|
||||
return TRUE;
|
||||
|
||||
if (path[len - 4] == G_DIR_SEPARATOR &&
|
||||
path[len - 3] == 'n' &&
|
||||
path[len - 2] == 'e' &&
|
||||
if (path[len - 4] == G_DIR_SEPARATOR && path[len - 3] == 'n' && path[len - 2] == 'e' &&
|
||||
path[len - 1] == 'w')
|
||||
return TRUE;
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
static gboolean
|
||||
clear_links (const char *path, DIR *dir)
|
||||
clear_links(const char* path, DIR* dir)
|
||||
{
|
||||
gboolean rv;
|
||||
struct dirent *dentry;
|
||||
gboolean rv;
|
||||
struct dirent* dentry;
|
||||
|
||||
rv = TRUE;
|
||||
errno = 0;
|
||||
|
||||
while ((dentry = readdir (dir))) {
|
||||
|
||||
guint8 d_type;
|
||||
char *fullpath;
|
||||
while ((dentry = readdir(dir))) {
|
||||
guint8 d_type;
|
||||
char* fullpath;
|
||||
|
||||
if (dentry->d_name[0] == '.')
|
||||
continue; /* ignore .,.. other dotdirs */
|
||||
|
||||
fullpath = g_build_path ("/", path, dentry->d_name, NULL);
|
||||
d_type = get_dtype (dentry, fullpath, TRUE/*lstat*/);
|
||||
fullpath = g_build_path("/", path, dentry->d_name, NULL);
|
||||
d_type = get_dtype(dentry, fullpath, TRUE /*lstat*/);
|
||||
|
||||
if (d_type == DT_LNK) {
|
||||
if (unlink (fullpath) != 0 ) {
|
||||
g_warning ("error unlinking %s: %s",
|
||||
fullpath, g_strerror(errno));
|
||||
if (unlink(fullpath) != 0) {
|
||||
g_warning("error unlinking %s: %s", fullpath, g_strerror(errno));
|
||||
rv = FALSE;
|
||||
}
|
||||
} else if (d_type == DT_DIR) {
|
||||
DIR *subdir;
|
||||
subdir = opendir (fullpath);
|
||||
DIR* subdir;
|
||||
subdir = opendir(fullpath);
|
||||
if (!subdir) {
|
||||
g_warning ("failed to open dir %s: %s",
|
||||
fullpath, g_strerror(errno));
|
||||
g_warning("failed to open dir %s: %s", fullpath, g_strerror(errno));
|
||||
rv = FALSE;
|
||||
goto next;
|
||||
}
|
||||
|
||||
if (!clear_links (fullpath, subdir))
|
||||
if (!clear_links(fullpath, subdir))
|
||||
rv = FALSE;
|
||||
|
||||
closedir (subdir);
|
||||
closedir(subdir);
|
||||
}
|
||||
|
||||
next:
|
||||
g_free (fullpath);
|
||||
g_free(fullpath);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
gboolean
|
||||
Mu::mu_maildir_clear_links (const char *path, GError **err)
|
||||
Mu::mu_maildir_clear_links(const char* path, GError** err)
|
||||
{
|
||||
DIR *dir;
|
||||
gboolean rv;
|
||||
DIR* dir;
|
||||
gboolean rv;
|
||||
|
||||
g_return_val_if_fail (path, FALSE);
|
||||
g_return_val_if_fail(path, FALSE);
|
||||
|
||||
dir = opendir (path);
|
||||
dir = opendir(path);
|
||||
if (!dir) {
|
||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_FILE_CANNOT_OPEN,
|
||||
"failed to open %s: %s", path, g_strerror(errno));
|
||||
g_set_error(err,
|
||||
MU_ERROR_DOMAIN,
|
||||
MU_ERROR_FILE_CANNOT_OPEN,
|
||||
"failed to open %s: %s",
|
||||
path,
|
||||
g_strerror(errno));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
rv = clear_links (path, dir);
|
||||
rv = clear_links(path, dir);
|
||||
|
||||
closedir (dir);
|
||||
closedir(dir);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
MuFlags
|
||||
Mu::mu_maildir_get_flags_from_path (const char *path)
|
||||
Mu::mu_maildir_get_flags_from_path(const char* path)
|
||||
{
|
||||
g_return_val_if_fail (path, MU_FLAG_INVALID);
|
||||
g_return_val_if_fail(path, MU_FLAG_INVALID);
|
||||
|
||||
/* try to find the info part */
|
||||
/* note that we can use either the ':', ';', or '!' as separator;
|
||||
@ -330,21 +327,20 @@ Mu::mu_maildir_get_flags_from_path (const char *path)
|
||||
*/
|
||||
|
||||
/* we check the dir -- */
|
||||
if (strstr (path, G_DIR_SEPARATOR_S "new" G_DIR_SEPARATOR_S)) {
|
||||
|
||||
char *dir, *dir2;
|
||||
if (strstr(path, G_DIR_SEPARATOR_S "new" G_DIR_SEPARATOR_S)) {
|
||||
char * dir, *dir2;
|
||||
MuFlags flags;
|
||||
|
||||
dir = g_path_get_dirname (path);
|
||||
dir2 = g_path_get_basename (dir);
|
||||
dir = g_path_get_dirname(path);
|
||||
dir2 = g_path_get_basename(dir);
|
||||
|
||||
flags = MU_FLAG_NONE;
|
||||
|
||||
if (g_strcmp0 (dir2, "new") == 0)
|
||||
if (g_strcmp0(dir2, "new") == 0)
|
||||
flags = MU_FLAG_NEW;
|
||||
|
||||
g_free (dir);
|
||||
g_free (dir2);
|
||||
g_free(dir);
|
||||
g_free(dir2);
|
||||
|
||||
/* NOTE: new/ message should not have :2,-stuff, as
|
||||
* per http://cr.yp.to/proto/maildir.html. If they, do
|
||||
@ -356,21 +352,19 @@ Mu::mu_maildir_get_flags_from_path (const char *path)
|
||||
|
||||
/* get the file flags */
|
||||
{
|
||||
const char *info;
|
||||
const char* info;
|
||||
|
||||
info = strrchr (path, '2');
|
||||
info = strrchr(path, '2');
|
||||
if (!info || info == path ||
|
||||
(info[-1] != ':' && info[-1] != '!' && info[-1] != ';') ||
|
||||
(info[1] != ','))
|
||||
(info[-1] != ':' && info[-1] != '!' && info[-1] != ';') || (info[1] != ','))
|
||||
return MU_FLAG_NONE;
|
||||
else
|
||||
return mu_flags_from_str
|
||||
(&info[2], MU_FLAG_TYPE_MAILFILE,
|
||||
TRUE /*ignore invalid */);
|
||||
return mu_flags_from_str(&info[2],
|
||||
MU_FLAG_TYPE_MAILFILE,
|
||||
TRUE /*ignore invalid */);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* take an existing message path, and return a new path, based on
|
||||
* whether it should be in 'new' or 'cur'; ie.
|
||||
@ -386,38 +380,45 @@ Mu::mu_maildir_get_flags_from_path (const char *path)
|
||||
*
|
||||
*/
|
||||
static char*
|
||||
get_new_path (const char *mdir, const char *mfile, MuFlags flags,
|
||||
const char* custom_flags, char flags_sep)
|
||||
get_new_path(const char* mdir,
|
||||
const char* mfile,
|
||||
MuFlags flags,
|
||||
const char* custom_flags,
|
||||
char flags_sep)
|
||||
{
|
||||
if (flags & MU_FLAG_NEW)
|
||||
return g_strdup_printf ("%s%cnew%c%s",
|
||||
mdir, G_DIR_SEPARATOR, G_DIR_SEPARATOR,
|
||||
mfile);
|
||||
return g_strdup_printf("%s%cnew%c%s",
|
||||
mdir,
|
||||
G_DIR_SEPARATOR,
|
||||
G_DIR_SEPARATOR,
|
||||
mfile);
|
||||
else {
|
||||
const char *flagstr;
|
||||
flagstr = mu_flags_to_str_s (flags, MU_FLAG_TYPE_MAILFILE);
|
||||
const char* flagstr;
|
||||
flagstr = mu_flags_to_str_s(flags, MU_FLAG_TYPE_MAILFILE);
|
||||
|
||||
return g_strdup_printf ("%s%ccur%c%s%c2,%s%s",
|
||||
mdir, G_DIR_SEPARATOR, G_DIR_SEPARATOR,
|
||||
mfile, flags_sep, flagstr,
|
||||
custom_flags ? custom_flags : "");
|
||||
return g_strdup_printf("%s%ccur%c%s%c2,%s%s",
|
||||
mdir,
|
||||
G_DIR_SEPARATOR,
|
||||
G_DIR_SEPARATOR,
|
||||
mfile,
|
||||
flags_sep,
|
||||
flagstr,
|
||||
custom_flags ? custom_flags : "");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
char*
|
||||
Mu::mu_maildir_get_maildir_from_path (const char* path)
|
||||
Mu::mu_maildir_get_maildir_from_path(const char* path)
|
||||
{
|
||||
char *mdir;
|
||||
char* mdir;
|
||||
|
||||
/* determine the maildir */
|
||||
mdir = g_path_get_dirname (path);
|
||||
if (!g_str_has_suffix (mdir, "cur") &&
|
||||
mdir = g_path_get_dirname(path);
|
||||
if (!g_str_has_suffix(mdir, "cur") &&
|
||||
|
||||
!g_str_has_suffix (mdir, "new")) {
|
||||
g_warning ("%s: not a valid maildir path: %s",
|
||||
__func__, path);
|
||||
g_free (mdir);
|
||||
!g_str_has_suffix(mdir, "new")) {
|
||||
g_warning("%s: not a valid maildir path: %s", __func__, path);
|
||||
g_free(mdir);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -427,22 +428,21 @@ Mu::mu_maildir_get_maildir_from_path (const char* path)
|
||||
return mdir;
|
||||
}
|
||||
|
||||
|
||||
static char*
|
||||
get_new_basename (void)
|
||||
get_new_basename(void)
|
||||
{
|
||||
return g_strdup_printf ("%u.%08x%08x.%s",
|
||||
(guint)time(NULL),
|
||||
g_random_int(),
|
||||
(gint32)g_get_monotonic_time (),
|
||||
g_get_host_name ());
|
||||
return g_strdup_printf("%u.%08x%08x.%s",
|
||||
(guint)time(NULL),
|
||||
g_random_int(),
|
||||
(gint32)g_get_monotonic_time(),
|
||||
g_get_host_name());
|
||||
}
|
||||
|
||||
static char*
|
||||
find_path_separator(const char *path)
|
||||
find_path_separator(const char* path)
|
||||
{
|
||||
const char *cur;
|
||||
for (cur = &path[strlen(path)-1]; cur > path; --cur) {
|
||||
const char* cur;
|
||||
for (cur = &path[strlen(path) - 1]; cur > path; --cur) {
|
||||
if ((*cur == ':' || *cur == '!' || *cur == ';') &&
|
||||
(cur[1] == '2' && cur[2] == ',')) {
|
||||
return (char*)cur;
|
||||
@ -452,60 +452,61 @@ find_path_separator(const char *path)
|
||||
}
|
||||
|
||||
char*
|
||||
Mu::mu_maildir_get_new_path (const char *oldpath, const char *new_mdir,
|
||||
MuFlags newflags, gboolean new_name)
|
||||
Mu::mu_maildir_get_new_path(const char* oldpath,
|
||||
const char* new_mdir,
|
||||
MuFlags newflags,
|
||||
gboolean new_name)
|
||||
{
|
||||
char *mfile, *mdir, *custom_flags, *cur, *newpath, flags_sep = ':';
|
||||
|
||||
g_return_val_if_fail (oldpath, NULL);
|
||||
g_return_val_if_fail(oldpath, NULL);
|
||||
|
||||
mfile = newpath = custom_flags = NULL;
|
||||
|
||||
/* determine the maildir */
|
||||
mdir = mu_maildir_get_maildir_from_path (oldpath);
|
||||
mdir = mu_maildir_get_maildir_from_path(oldpath);
|
||||
if (!mdir)
|
||||
return NULL;
|
||||
|
||||
/* determine the name of the location of the flag separator */
|
||||
/* determine the name of the location of the flag separator */
|
||||
|
||||
if (new_name) {
|
||||
mfile = get_new_basename ();
|
||||
cur = find_path_separator (oldpath);
|
||||
mfile = get_new_basename();
|
||||
cur = find_path_separator(oldpath);
|
||||
if (cur) {
|
||||
/* preserve the existing flags separator
|
||||
* in the new file name */
|
||||
flags_sep = *cur;
|
||||
}
|
||||
} else {
|
||||
mfile = g_path_get_basename (oldpath);
|
||||
cur = find_path_separator (mfile);
|
||||
mfile = g_path_get_basename(oldpath);
|
||||
cur = find_path_separator(mfile);
|
||||
if (cur) {
|
||||
/* get the custom flags (if any) */
|
||||
custom_flags = mu_flags_custom_from_str (cur + 3);
|
||||
custom_flags = mu_flags_custom_from_str(cur + 3);
|
||||
/* preserve the existing flags separator
|
||||
* in the new file name */
|
||||
flags_sep = *cur;
|
||||
cur[0] = '\0'; /* strip the flags */
|
||||
cur[0] = '\0'; /* strip the flags */
|
||||
}
|
||||
}
|
||||
|
||||
newpath = get_new_path (new_mdir ? new_mdir : mdir,
|
||||
mfile, newflags, custom_flags, flags_sep);
|
||||
g_free (mfile);
|
||||
g_free (mdir);
|
||||
g_free (custom_flags);
|
||||
newpath =
|
||||
get_new_path(new_mdir ? new_mdir : mdir, mfile, newflags, custom_flags, flags_sep);
|
||||
g_free(mfile);
|
||||
g_free(mdir);
|
||||
g_free(custom_flags);
|
||||
|
||||
return newpath;
|
||||
}
|
||||
|
||||
|
||||
static gint64
|
||||
get_file_size (const char* path)
|
||||
get_file_size(const char* path)
|
||||
{
|
||||
int rv;
|
||||
struct stat statbuf;
|
||||
int rv;
|
||||
struct stat statbuf;
|
||||
|
||||
rv = stat (path, &statbuf);
|
||||
rv = stat(path, &statbuf);
|
||||
if (rv != 0) {
|
||||
/* g_warning ("error: %s", g_strerror (errno)); */
|
||||
return -1;
|
||||
@ -514,62 +515,62 @@ get_file_size (const char* path)
|
||||
return (gint64)statbuf.st_size;
|
||||
}
|
||||
|
||||
|
||||
static gboolean
|
||||
msg_move_check_pre (const char *src, const char *dst, GError **err)
|
||||
msg_move_check_pre(const char* src, const char* dst, GError** err)
|
||||
{
|
||||
gint size1, size2;
|
||||
|
||||
if (!g_path_is_absolute(src))
|
||||
return mu_util_g_set_error
|
||||
(err, MU_ERROR_FILE,
|
||||
"source is not an absolute path: '%s'", src);
|
||||
return mu_util_g_set_error(err,
|
||||
MU_ERROR_FILE,
|
||||
"source is not an absolute path: '%s'",
|
||||
src);
|
||||
|
||||
if (!g_path_is_absolute(dst))
|
||||
return mu_util_g_set_error
|
||||
(err, MU_ERROR_FILE,
|
||||
"target is not an absolute path: '%s'", dst);
|
||||
return mu_util_g_set_error(err,
|
||||
MU_ERROR_FILE,
|
||||
"target is not an absolute path: '%s'",
|
||||
dst);
|
||||
|
||||
if (access (src, R_OK) != 0)
|
||||
return mu_util_g_set_error (err, MU_ERROR_FILE,
|
||||
"cannot read %s", src);
|
||||
if (access(src, R_OK) != 0)
|
||||
return mu_util_g_set_error(err, MU_ERROR_FILE, "cannot read %s", src);
|
||||
|
||||
if (access (dst, F_OK) != 0)
|
||||
if (access(dst, F_OK) != 0)
|
||||
return TRUE;
|
||||
|
||||
/* target exist; we simply overwrite it, unless target has a different
|
||||
* size. ignore the exceedingly rare case where have duplicate message
|
||||
* file names with different content yet the same length. (md5 etc. is a
|
||||
* bit slow) */
|
||||
size1 = get_file_size (src);
|
||||
size2 = get_file_size (dst);
|
||||
size1 = get_file_size(src);
|
||||
size2 = get_file_size(dst);
|
||||
if (size1 != size2)
|
||||
return mu_util_g_set_error (err, MU_ERROR_FILE,
|
||||
"%s already exists", dst);
|
||||
return mu_util_g_set_error(err, MU_ERROR_FILE, "%s already exists", dst);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
msg_move_check_post (const char *src, const char *dst, GError **err)
|
||||
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->%s)", src, dst);
|
||||
if (access(dst, F_OK) != 0)
|
||||
return mu_util_g_set_error(err,
|
||||
MU_ERROR_FILE,
|
||||
"can't find target (%s->%s)",
|
||||
src,
|
||||
dst);
|
||||
|
||||
if (access (src, F_OK) == 0) {
|
||||
if (access(src, F_OK) == 0) {
|
||||
if (g_strcmp0(src, dst) == 0) {
|
||||
g_warning("moved %s to itself", src);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if (g_strcmp0(src, dst) == 0) {
|
||||
g_warning ("moved %s to itself", src);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* this could happen if some other tool (for mail syncing) is
|
||||
* interfering */
|
||||
g_debug ("the source is still there (%s->%s)",
|
||||
src, dst);
|
||||
}
|
||||
/* this could happen if some other tool (for mail syncing) is
|
||||
* interfering */
|
||||
g_debug("the source is still there (%s->%s)", src, dst);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@ -577,65 +578,65 @@ msg_move_check_post (const char *src, const char *dst, GError **err)
|
||||
/* use GIO to move files; this is slower than rename() so only use
|
||||
* this when needed: when moving across filesystems */
|
||||
static gboolean
|
||||
msg_move_g_file (const char* src, const char *dst, GError **err)
|
||||
msg_move_g_file(const char* src, const char* dst, GError** err)
|
||||
{
|
||||
GFile *srcfile, *dstfile;
|
||||
gboolean res;
|
||||
GFile * srcfile, *dstfile;
|
||||
gboolean res;
|
||||
|
||||
srcfile = g_file_new_for_path (src);
|
||||
dstfile = g_file_new_for_path (dst);
|
||||
srcfile = g_file_new_for_path(src);
|
||||
dstfile = g_file_new_for_path(dst);
|
||||
|
||||
res = g_file_move (srcfile, dstfile, G_FILE_COPY_NONE,
|
||||
NULL, NULL, NULL, err);
|
||||
res = g_file_move(srcfile, dstfile, G_FILE_COPY_NONE, NULL, NULL, NULL, err);
|
||||
|
||||
g_clear_object (&srcfile);
|
||||
g_clear_object (&dstfile);
|
||||
g_clear_object(&srcfile);
|
||||
g_clear_object(&dstfile);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
msg_move (const char* src, const char *dst, GError **err)
|
||||
msg_move(const char* src, const char* dst, GError** err)
|
||||
{
|
||||
if (!msg_move_check_pre (src, dst, err))
|
||||
if (!msg_move_check_pre(src, dst, err))
|
||||
return FALSE;
|
||||
|
||||
if (rename (src, dst) == 0) /* seems it worked. */
|
||||
return msg_move_check_post (src, dst, err);
|
||||
if (rename(src, dst) == 0) /* seems it worked. */
|
||||
return msg_move_check_post(src, dst, err);
|
||||
|
||||
if (errno != EXDEV) /* some unrecoverable error occurred */
|
||||
return mu_util_g_set_error
|
||||
(err, MU_ERROR_FILE, "error moving %s -> %s", src, dst);
|
||||
return mu_util_g_set_error(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);
|
||||
return msg_move_g_file(src, dst, err);
|
||||
}
|
||||
|
||||
char*
|
||||
Mu::mu_maildir_move_message (const char* oldpath, const char* targetmdir,
|
||||
MuFlags newflags, gboolean ignore_dups,
|
||||
gboolean new_name, GError **err)
|
||||
Mu::mu_maildir_move_message(const char* oldpath,
|
||||
const char* targetmdir,
|
||||
MuFlags newflags,
|
||||
gboolean ignore_dups,
|
||||
gboolean new_name,
|
||||
GError** err)
|
||||
{
|
||||
char *newfullpath;
|
||||
gboolean rv;
|
||||
gboolean src_is_target;
|
||||
char* newfullpath;
|
||||
gboolean rv;
|
||||
gboolean src_is_target;
|
||||
|
||||
g_return_val_if_fail (oldpath, FALSE);
|
||||
g_return_val_if_fail(oldpath, FALSE);
|
||||
|
||||
/* first try *without* changing the name (as per new_name), since
|
||||
* src_is_target shouldn't use a changed name */
|
||||
newfullpath = mu_maildir_get_new_path (oldpath, targetmdir,
|
||||
newflags, FALSE);
|
||||
newfullpath = mu_maildir_get_new_path(oldpath, targetmdir, newflags, FALSE);
|
||||
if (!newfullpath) {
|
||||
mu_util_g_set_error (err, MU_ERROR_FILE,
|
||||
"failed to determine targetpath");
|
||||
mu_util_g_set_error(err, MU_ERROR_FILE, "failed to determine targetpath");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
src_is_target = (g_strcmp0 (oldpath, newfullpath) == 0);
|
||||
src_is_target = (g_strcmp0(oldpath, newfullpath) == 0);
|
||||
if (!ignore_dups && src_is_target) {
|
||||
mu_util_g_set_error (err, MU_ERROR_FILE_TARGET_EQUALS_SOURCE,
|
||||
"target equals source");
|
||||
mu_util_g_set_error(err,
|
||||
MU_ERROR_FILE_TARGET_EQUALS_SOURCE,
|
||||
"target equals source");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -643,22 +644,23 @@ Mu::mu_maildir_move_message (const char* oldpath, const char* targetmdir,
|
||||
* new name in the new_name case */
|
||||
if (!src_is_target && new_name) {
|
||||
g_free(newfullpath);
|
||||
newfullpath = mu_maildir_get_new_path (oldpath, targetmdir,
|
||||
newflags, new_name);
|
||||
newfullpath = mu_maildir_get_new_path(oldpath, targetmdir, newflags, new_name);
|
||||
if (!newfullpath) {
|
||||
mu_util_g_set_error (err, MU_ERROR_FILE,
|
||||
"failed to determine targetpath");
|
||||
mu_util_g_set_error(err, MU_ERROR_FILE, "failed to determine targetpath");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (!src_is_target) {
|
||||
g_debug ("moving %s (%s, %x, %d) --> %s",
|
||||
oldpath, targetmdir, newflags, new_name,
|
||||
newfullpath);
|
||||
rv = msg_move (oldpath, newfullpath, err);
|
||||
g_debug("moving %s (%s, %x, %d) --> %s",
|
||||
oldpath,
|
||||
targetmdir,
|
||||
newflags,
|
||||
new_name,
|
||||
newfullpath);
|
||||
rv = msg_move(oldpath, newfullpath, err);
|
||||
if (!rv) {
|
||||
g_free (newfullpath);
|
||||
g_free(newfullpath);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user