alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-msg-file: cleanup message path (realpath)

Browse Source
This commit is contained in:
djcb
2012-08-01 23:21:59 +03:00
parent 3814fb81c2
commit 8d517021bb
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/mu-msg-file.c
View File

@ -104,31 +104,37 @@ init_file_metadata (MuMsgFile *self, const char* path, const gchar* mdir,
struct stat statbuf; struct stat statbuf;
if (access (path, R_OK) != 0) { if (access (path, R_OK) != 0) {
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_FILE, mu_util_g_set_error (err, MU_ERROR_FILE,
"cannot read file %s: %s", "cannot read file %s: %s",
path, strerror(errno)); path, strerror(errno));
return FALSE; return FALSE;
} }
if (stat (path, &statbuf) < 0) { if (stat (path, &statbuf) < 0) {
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_FILE, mu_util_g_set_error (err, MU_ERROR_FILE,
"cannot stat %s: %s", "cannot stat %s: %s",
path, strerror(errno)); path, strerror(errno));
return FALSE; return FALSE;
} }
if (!S_ISREG(statbuf.st_mode)) { if (!S_ISREG(statbuf.st_mode)) {
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_FILE, mu_util_g_set_error (err, MU_ERROR_FILE,
"not a regular file: %s", path); "not a regular file: %s", path);
return FALSE; return FALSE;
} }
self->_timestamp = statbuf.st_mtime; self->_timestamp = statbuf.st_mtime;
self->_size = (size_t)statbuf.st_size; self->_size = (size_t)statbuf.st_size;
strncpy (self->_path, path, PATH_MAX); /* remove double slashes, relative paths etc. from path & mdir */
strncpy (self->_maildir, mdir ? mdir : "", PATH_MAX); if (!realpath (path, self->_path)) {
mu_util_g_set_error (err, MU_ERROR_FILE,
"could not get realpath for %s: %s",
path, strerror(errno));
return FALSE;
}
strncpy (self->_maildir, mdir ? mdir : "", PATH_MAX);
return TRUE; return TRUE;
} }