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

* mu_maildir_walk: skip the final / from dirnames

This commit is contained in:
Dirk-Jan C. Binnema 2010-01-02 16:05:23 +02:00
parent b1a9cf8450
commit ae5c92fc7a
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/mu-maildir.c
View File

@ -167,25 +167,22 @@ mu_maildir_link (const char* src, const char *targetpath)
g_return_val_if_fail (src, FALSE); g_return_val_if_fail (src, FALSE);
g_return_val_if_fail (targetpath, FALSE); g_return_val_if_fail (targetpath, FALSE);
/* just a basic check */
if (access (src, R_OK) != 0) {
g_warning ("Cannot read source message: %s",
strerror (errno));
return FALSE;
}
targetfullpath = _get_target_fullpath (src, targetpath); targetfullpath = _get_target_fullpath (src, targetpath);
if (!targetfullpath) if (!targetfullpath)
return FALSE; return FALSE;
rv = symlink (src, targetfullpath); rv = symlink (src, targetfullpath);
g_free (targetfullpath);
if (rv != 0) { if (rv != 0) {
g_warning ("Error creating link: %s", strerror (errno)); g_warning ("Error creating link %s => %s: %s",
targetfullpath, src,
strerror (errno));
g_free (targetfullpath);
return FALSE; return FALSE;
} }
g_free (targetfullpath);
return TRUE; return TRUE;
} }
@ -235,7 +232,7 @@ process_file (const char* fullpath, MuMaildirWalkMsgCallback cb, void *data)
* (we're skipping 'tmp' for obvious reasons) * (we're skipping 'tmp' for obvious reasons)
*/ */
G_GNUC_CONST static gboolean G_GNUC_CONST static gboolean
is_maildir_new_or_cur (const char *path) _is_maildir_new_or_cur (const char *path)
{ {
size_t len; size_t len;
const char *sfx; const char *sfx;
@ -320,14 +317,15 @@ process_dir_entry (const char* path,struct dirent *entry,
/* ignore special dirs: */ /* ignore special dirs: */
if (_ignore_dir_entry (entry)) if (_ignore_dir_entry (entry))
return MU_OK; return MU_OK;
fullpath = g_newa (char, strlen(path) + 1 + strlen(entry->d_name) + 1); fullpath = g_newa (char, strlen(path) + strlen(entry->d_name) + 1);
sprintf (fullpath, "%s%c%s", path, G_DIR_SEPARATOR, entry->d_name); sprintf (fullpath, "%s%c%s", path, G_DIR_SEPARATOR,
entry->d_name);
switch (entry->d_type) { switch (entry->d_type) {
case DT_REG: case DT_REG:
/* we only want files in cur/ and new/ */ /* we only want files in cur/ and new/ */
if (!is_maildir_new_or_cur (path)) if (!_is_maildir_new_or_cur (path))
return MU_OK; return MU_OK;
return process_file (fullpath, cb_msg, data); return process_file (fullpath, cb_msg, data);
@ -414,19 +412,15 @@ process_dir (const char* path, MuMaildirWalkMsgCallback msg_cb,
return result; return result;
} }
MuResult MuResult
mu_maildir_walk (const char *path, MuMaildirWalkMsgCallback cb_msg, mu_maildir_walk (const char *path, MuMaildirWalkMsgCallback cb_msg,
MuMaildirWalkDirCallback cb_dir, void *data) MuMaildirWalkDirCallback cb_dir, void *data)
{ {
struct stat statbuf; struct stat statbuf;
g_return_val_if_fail (path && cb_msg, MU_ERROR); g_return_val_if_fail (path && cb_msg, MU_ERROR);
if (access(path, R_OK) != 0) {
g_warning ("cannot access %s: %s", path, strerror(errno));
return MU_ERROR;
}
if (stat (path, &statbuf) != 0) { if (stat (path, &statbuf) != 0) {
g_warning ("cannot stat %s: %s", path, strerror(errno)); g_warning ("cannot stat %s: %s", path, strerror(errno));
return MU_ERROR; return MU_ERROR;
@ -434,12 +428,21 @@ mu_maildir_walk (const char *path, MuMaildirWalkMsgCallback cb_msg,
if (S_ISREG(statbuf.st_mode)) if (S_ISREG(statbuf.st_mode))
return process_file (path, cb_msg, data); return process_file (path, cb_msg, data);
else if (S_ISDIR(statbuf.st_mode))
return process_dir (path, cb_msg, cb_dir, data); if (S_ISDIR(statbuf.st_mode)) {
else /* skip the final slash from dirnames */
g_warning ("%s: unsupported file type for %s", MuResult rv;
__FUNCTION__, path); char *mypath = g_strdup (path);
if (mypath[strlen(mypath)-1] == G_DIR_SEPARATOR)
mypath[strlen(mypath)-1] = '\0';
rv = process_dir (mypath, cb_msg, cb_dir, data);
g_free (mypath);
return rv;
}
g_warning ("%s: unsupported file type for %s",
__FUNCTION__, path);
return MU_ERROR; return MU_ERROR;
} }