/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "procheader.h"
#include "utils.h"
+static void mh_folder_init (Folder *folder,
+ const gchar *name,
+ const gchar *path);
+
+GSList *mh_get_msg_list (Folder *folder,
+ FolderItem *item,
+ gboolean use_cache);
+gchar *mh_fetch_msg (Folder *folder,
+ FolderItem *item,
+ gint num);
+MsgInfo *mh_fetch_msginfo (Folder *folder,
+ FolderItem *item,
+ gint num);
+gint mh_add_msg (Folder *folder,
+ FolderItem *dest,
+ const gchar *file,
+ gboolean remove_source);
+gint mh_move_msg (Folder *folder,
+ FolderItem *dest,
+ MsgInfo *msginfo);
+gint mh_move_msgs_with_dest (Folder *folder,
+ FolderItem *dest,
+ GSList *msglist);
+gint mh_copy_msg (Folder *folder,
+ FolderItem *dest,
+ MsgInfo *msginfo);
+gint mh_copy_msgs_with_dest (Folder *folder,
+ FolderItem *dest,
+ GSList *msglist);
+gint mh_remove_msg (Folder *folder,
+ FolderItem *item,
+ gint num);
+gint mh_remove_all_msg (Folder *folder,
+ FolderItem *item);
+gboolean mh_is_msg_changed (Folder *folder,
+ FolderItem *item,
+ MsgInfo *msginfo);
+
+gint mh_scan_folder (Folder *folder,
+ FolderItem *item);
+gint mh_get_num_list (Folder *folder,
+ FolderItem *item,
+ GSList **list);
+void mh_scan_tree (Folder *folder);
+
+gint mh_create_tree (Folder *folder);
+FolderItem *mh_create_folder (Folder *folder,
+ FolderItem *parent,
+ const gchar *name);
+gint mh_rename_folder (Folder *folder,
+ FolderItem *item,
+ const gchar *name);
+gint mh_remove_folder (Folder *folder,
+ FolderItem *item);
+
+gchar *mh_get_new_msg_filename (FolderItem *dest);
+
static GSList *mh_get_uncached_msgs (GHashTable *msg_table,
FolderItem *item);
static MsgInfo *mh_parse_msg (const gchar *file,
gpointer data);
+Folder *mh_folder_new(const gchar *name, const gchar *path)
+{
+ Folder *folder;
+
+ folder = (Folder *)g_new0(MHFolder, 1);
+ mh_folder_init(folder, name, path);
+
+ return folder;
+}
+
+void mh_folder_destroy(Folder *folder)
+{
+ folder_local_folder_destroy(LOCAL_FOLDER(folder));
+}
+
+static void mh_folder_init(Folder *folder, const gchar *name, const gchar *path)
+{
+ folder->type = F_MH;
+
+ folder_local_folder_init(folder, name, path);
+
+/* folder->get_msg_list = mh_get_msg_list; */
+ folder->fetch_msg = mh_fetch_msg;
+ folder->fetch_msginfo = mh_fetch_msginfo;
+ folder->add_msg = mh_add_msg;
+ folder->move_msg = mh_move_msg;
+ folder->move_msgs_with_dest = mh_move_msgs_with_dest;
+ folder->copy_msg = mh_copy_msg;
+ folder->copy_msgs_with_dest = mh_copy_msgs_with_dest;
+ folder->remove_msg = mh_remove_msg;
+ folder->remove_all_msg = mh_remove_all_msg;
+ folder->is_msg_changed = mh_is_msg_changed;
+/* folder->scan = mh_scan_folder; */
+ folder->get_num_list = mh_get_num_list;
+ folder->scan_tree = mh_scan_tree;
+ folder->create_tree = mh_create_tree;
+ folder->create_folder = mh_create_folder;
+ folder->rename_folder = mh_rename_folder;
+ folder->remove_folder = mh_remove_folder;
+ folder->destroy = mh_folder_destroy;
+}
+
+void mh_get_last_num(Folder *folder, FolderItem *item)
+{
+ gchar *path;
+ DIR *dp;
+ struct dirent *d;
+ struct stat s;
+ gint max = 0;
+ gint num;
+
+ g_return_if_fail(item != NULL);
+
+ debug_print("mh_get_last_num(): Scanning %s ...\n", item->path);
+
+ path = folder_item_get_path(item);
+ g_return_if_fail(path != NULL);
+ if (change_dir(path) < 0) {
+ g_free(path);
+ return;
+ }
+ g_free(path);
+
+ if ((dp = opendir(".")) == NULL) {
+ FILE_OP_ERROR(item->path, "opendir");
+ return;
+ }
+
+ while ((d = readdir(dp)) != NULL) {
+ if ((num = to_number(d->d_name)) >= 0 &&
+ stat(d->d_name, &s) == 0 &&
+ S_ISREG(s.st_mode)) {
+ if (max < num)
+ max = num;
+ }
+ }
+ closedir(dp);
+
+ debug_print("Last number in dir %s = %d\n", item->path, max);
+ item->last_num = max;
+}
+
+gint mh_get_num_list(Folder *folder, FolderItem *item, GSList **list)
+{
+
+ gchar *path;
+ DIR *dp;
+ struct dirent *d;
+ struct stat s;
+ gint num, nummsgs = 0;
+
+ g_return_val_if_fail(item != NULL, -1);
+
+ debug_print("mh_get_last_num(): Scanning %s ...\n", item->path);
+
+ path = folder_item_get_path(item);
+ g_return_val_if_fail(path != NULL, -1);
+ if (change_dir(path) < 0) {
+ g_free(path);
+ return -1;
+ }
+ g_free(path);
+
+ if ((dp = opendir(".")) == NULL) {
+ FILE_OP_ERROR(item->path, "opendir");
+ return -1;
+ }
+
+ while ((d = readdir(dp)) != NULL) {
+ if ((num = to_number(d->d_name)) >= 0 &&
+ stat(d->d_name, &s) == 0 &&
+ S_ISREG(s.st_mode)) {
+ *list = g_slist_prepend(*list, GINT_TO_POINTER(num));
+ nummsgs++;
+ }
+ }
+ closedir(dp);
+
+ return nummsgs;
+}
+
GSList *mh_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
{
GSList *mlist;
if (stat(path, &s) < 0) {
FILE_OP_ERROR(path, "stat");
} else {
- if (item->mtime == s.st_mtime) {
+ time_t mtime;
+
+ mtime = MAX(s.st_mtime, s.st_ctime);
+ if (item->mtime == mtime) {
debug_print("Folder is not modified.\n");
scan_new = FALSE;
} else
- item->mtime = s.st_mtime;
+ item->mtime = mtime;
}
g_free(path);
gchar *file;
g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(num > 0 && num <= item->last_num, NULL);
+ g_return_val_if_fail(num > 0, NULL);
path = folder_item_get_path(item);
file = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
return file;
}
+MsgInfo *mh_fetch_msginfo(Folder *folder, FolderItem *item, gint num)
+{
+ gchar *path;
+ gchar *file;
+ MsgFlags flags;
+ MsgInfo *msginfo;
+ struct stat s;
+
+ g_return_val_if_fail(item != NULL, NULL);
+ g_return_val_if_fail(num > 0, NULL);
+
+ path = folder_item_get_path(item);
+ file = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
+ g_free(path);
+ if (!is_file_exist(file)) {
+ g_free(file);
+ return NULL;
+ }
+
+ folder_item_set_default_flags(item, &flags);
+ msginfo = procheader_parse_file(file, flags, TRUE, FALSE);
+ if(!msginfo) {
+ g_free(file);
+ return NULL;
+ }
+
+ msginfo->msgnum = num;
+ msginfo->folder = item;
+
+ if (stat(file, &s) < 0) {
+ FILE_OP_ERROR(file, "stat");
+ msginfo->size = 0;
+ msginfo->mtime = 0;
+ } else {
+ msginfo->size = s.st_size;
+ msginfo->mtime = s.st_mtime;
+ }
+
+ g_free(file);
+
+ return msginfo;
+}
+
+gchar *mh_get_new_msg_filename(FolderItem *dest)
+{
+ gchar *destfile;
+ gchar *destpath;
+
+ destpath = folder_item_get_path(dest);
+ g_return_val_if_fail(destpath != NULL, NULL);
+
+ if (!is_dir_exist(destpath))
+ make_dir_hier(destpath);
+
+ for (;;) {
+ destfile = g_strdup_printf("%s%c%d", destpath, G_DIR_SEPARATOR,
+ dest->last_num + 1);
+ if (is_file_entry_exist(destfile)) {
+ dest->last_num++;
+ g_free(destfile);
+ } else
+ break;
+ }
+
+ g_free(destpath);
+
+ return destfile;
+}
+
+#define SET_DEST_MSG_FLAGS(fp, dest, msginfo) \
+{ \
+ MsgInfo newmsginfo; \
+ \
+ newmsginfo.msgnum = dest->last_num; \
+ newmsginfo.flags = msginfo->flags; \
+ if (dest->stype == F_OUTBOX || \
+ dest->stype == F_QUEUE || \
+ dest->stype == F_DRAFT || \
+ dest->stype == F_TRASH) \
+ MSG_UNSET_PERM_FLAGS(newmsginfo.flags, \
+ MSG_NEW|MSG_UNREAD|MSG_DELETED); \
+ \
+ procmsg_write_flags(&newmsginfo, fp); \
+}
+
gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
gboolean remove_source)
{
- gchar *destpath;
gchar *destfile;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(file != NULL, -1);
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
- destpath = folder_item_get_path(dest);
- g_return_val_if_fail(destpath != NULL, -1);
- if (!is_dir_exist(destpath))
- make_dir_hier(destpath);
-
- destfile = g_strdup_printf("%s%c%d", destpath, G_DIR_SEPARATOR,
- dest->last_num + 1);
+ destfile = mh_get_new_msg_filename(dest);
+ g_return_val_if_fail(destfile != NULL, -1);
if (link(file, destfile) < 0) {
- if (EXDEV == errno) {
- if (copy_file(file, destfile) < 0) {
- g_warning(_("can't copy message %s to %s\n"),
- file, destfile);
- g_free(destfile);
- return -1;
- }
- } else {
- FILE_OP_ERROR(file, "link");
+ if (copy_file(file, destfile, TRUE) < 0) {
+ g_warning(_("can't copy message %s to %s\n"),
+ file, destfile);
g_free(destfile);
return -1;
}
return dest->last_num;
}
-gint mh_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
+static gint mh_do_move(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
- gchar *destdir;
gchar *srcfile;
gchar *destfile;
- FILE *fp;
+ gint filemode = 0;
+ PrefsFolderItem *prefs;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msginfo != NULL, -1);
}
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
- destdir = folder_item_get_path(dest);
- if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
- g_warning(_("Can't open mark file.\n"));
+ prefs = dest->prefs;
+
+ destfile = mh_get_new_msg_filename(dest);
+ if (!destfile) return -1;
- debug_print(_("Moving message %s%c%d to %s ...\n"),
+ srcfile = procmsg_get_message_file(msginfo);
+
+ debug_print("Moving message %s%c%d to %s ...\n",
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, dest->path);
- srcfile = procmsg_get_message_file_path(msginfo);
- destfile = g_strdup_printf("%s%c%d", destdir, G_DIR_SEPARATOR,
- dest->last_num + 1);
- g_free(destdir);
- if (move_file(srcfile, destfile) < 0) {
+ if (move_file(srcfile, destfile, FALSE) < 0) {
g_free(srcfile);
g_free(destfile);
- if (fp) fclose(fp);
return -1;
}
+ if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
+ if (chmod(destfile, prefs->folder_chmod) < 0)
+ FILE_OP_ERROR(destfile, "chmod");
+
+ /* for mark file */
+ filemode = prefs->folder_chmod;
+ if (filemode & S_IRGRP) filemode |= S_IWGRP;
+ if (filemode & S_IROTH) filemode |= S_IWOTH;
+ }
+
g_free(srcfile);
g_free(destfile);
dest->last_num++;
- if (fp) {
- MsgInfo newmsginfo;
-
- newmsginfo.msgnum = dest->last_num;
- newmsginfo.flags = msginfo->flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_FLAGS(newmsginfo.flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
-
- procmsg_write_flags(&newmsginfo, fp);
- fclose(fp);
- }
-
return dest->last_num;
}
-gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
+gint mh_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
+{
+ gchar *srcfile;
+ gint ret = 0;
+
+ g_return_val_if_fail(folder != NULL, -1);
+ g_return_val_if_fail(dest != NULL, -1);
+ g_return_val_if_fail(msginfo != NULL, -1);
+ g_return_val_if_fail(msginfo->folder != NULL, -1);
+
+ if (folder == msginfo->folder->folder)
+ return mh_do_move(folder, dest, msginfo);
+
+ srcfile = procmsg_get_message_file(msginfo);
+ if (!srcfile) return -1;
+
+ ret = mh_add_msg(folder, dest, srcfile, FALSE);
+ g_free(srcfile);
+
+ if (ret != -1) {
+ gchar *destdir;
+ FILE *fp;
+
+ destdir = folder_item_get_path(dest);
+ if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
+ g_warning(_("Can't open mark file.\n"));
+ else {
+ SET_DEST_MSG_FLAGS(fp, dest, msginfo);
+ fclose(fp);
+ }
+ g_free(destdir);
+
+ ret = folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
+ }
+
+ return ret;
+}
+
+static gint mh_do_move_msgs_with_dest(Folder *folder, FolderItem *dest,
+ GSList *msglist)
{
- gchar *destdir;
gchar *srcfile;
gchar *destfile;
- FILE *fp;
GSList *cur;
MsgInfo *msginfo;
+ PrefsFolderItem *prefs;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msglist != NULL, -1);
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
- destdir = folder_item_get_path(dest);
- if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
- g_warning(_("Can't open mark file.\n"));
+ prefs = dest->prefs;
for (cur = msglist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
g_warning(_("the src folder is identical to the dest.\n"));
continue;
}
- debug_print(_("Moving message %s%c%d to %s ...\n"),
+ debug_print("Moving message %s%c%d to %s ...\n",
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, dest->path);
- srcfile = procmsg_get_message_file_path(msginfo);
- destfile = g_strdup_printf("%s%c%d", destdir, G_DIR_SEPARATOR,
- dest->last_num + 1);
+ destfile = mh_get_new_msg_filename(dest);
+ if (!destfile) return -1;
+ srcfile = procmsg_get_message_file(msginfo);
- if (move_file(srcfile, destfile) < 0) {
+ if (move_file(srcfile, destfile, FALSE) < 0) {
g_free(srcfile);
g_free(destfile);
break;
g_free(srcfile);
g_free(destfile);
dest->last_num++;
+ }
+
+ return dest->last_num;
+}
- if (fp) {
- MsgInfo newmsginfo;
+gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
+{
+ MsgInfo *msginfo;
+ GSList *cur;
+ gint ret = 0;
- newmsginfo.msgnum = dest->last_num;
- newmsginfo.flags = msginfo->flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_FLAGS(newmsginfo.flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
+ msginfo = (MsgInfo *)msglist->data;
+ if (folder == msginfo->folder->folder)
+ return mh_do_move_msgs_with_dest(folder, dest, msglist);
- procmsg_write_flags(&newmsginfo, fp);
- }
+ for (cur = msglist; cur != NULL; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ ret = mh_move_msg(folder, dest, msginfo);
+ if (ret == -1) break;
}
- g_free(destdir);
- if (fp) fclose(fp);
-
- return dest->last_num;
+ return ret;
}
gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
- gchar *destdir;
gchar *srcfile;
gchar *destfile;
- FILE *fp;
+ gint filemode = 0;
+ PrefsFolderItem *prefs;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msginfo != NULL, -1);
}
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
- destdir = folder_item_get_path(dest);
- if (!is_dir_exist(destdir))
- make_dir_hier(destdir);
+ prefs = dest->prefs;
- if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
- g_warning(_("Can't open mark file.\n"));
-
- debug_print(_("Copying message %s%c%d to %s ...\n"),
- msginfo->folder->path, G_DIR_SEPARATOR,
- msginfo->msgnum, dest->path);
- srcfile = procmsg_get_message_file_path(msginfo);
- destfile = g_strdup_printf("%s%c%d", destdir, G_DIR_SEPARATOR,
- dest->last_num + 1);
- g_free(destdir);
-
- if (is_file_exist(destfile)) {
- g_warning(_("%s already exists."), destfile);
+ srcfile = procmsg_get_message_file(msginfo);
+ destfile = mh_get_new_msg_filename(dest);
+ if (!destfile) {
g_free(srcfile);
- g_free(destfile);
- if (fp) fclose(fp);
return -1;
}
+
+ debug_print("Copying message %s%c%d to %s ...\n",
+ msginfo->folder->path, G_DIR_SEPARATOR,
+ msginfo->msgnum, dest->path);
+
- if (copy_file(srcfile, destfile) < 0) {
+ if (copy_file(srcfile, destfile, TRUE) < 0) {
FILE_OP_ERROR(srcfile, "copy");
g_free(srcfile);
g_free(destfile);
- if (fp) fclose(fp);
return -1;
}
+ if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
+ if (chmod(destfile, prefs->folder_chmod) < 0)
+ FILE_OP_ERROR(destfile, "chmod");
+
+ /* for mark file */
+ filemode = prefs->folder_chmod;
+ if (filemode & S_IRGRP) filemode |= S_IWGRP;
+ if (filemode & S_IROTH) filemode |= S_IWOTH;
+ }
+
g_free(srcfile);
g_free(destfile);
dest->last_num++;
- if (fp) {
- MsgInfo newmsginfo;
-
- newmsginfo.msgnum = dest->last_num;
- newmsginfo.flags = msginfo->flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_FLAGS(newmsginfo.flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
- procmsg_write_flags(&newmsginfo, fp);
- fclose(fp);
- }
-
return dest->last_num;
}
num = folder->add_msg(folder, dest, filename, FALSE);
destdir = folder_item_get_path(dest);
- if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
- g_warning(_("Can't open mark file.\n"));
if (fp) {
MsgInfo newmsginfo;
gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
{
- gchar *destdir;
gchar *srcfile;
gchar *destfile;
- FILE *fp;
GSList *cur;
MsgInfo *msginfo;
g_return_val_if_fail(msglist != NULL, -1);
if (dest->last_num < 0) {
- mh_scan_folder(folder, dest);
+ mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
- destdir = folder_item_get_path(dest);
- if (!is_dir_exist(destdir))
- make_dir_hier(destdir);
-
- if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
- g_warning(_("Can't open mark file.\n"));
-
for (cur = msglist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
g_warning(_("the src folder is identical to the dest.\n"));
continue;
}
- debug_print(_("Copying message %s%c%d to %s ...\n"),
+ debug_print("Copying message %s%c%d to %s ...\n",
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, dest->path);
- srcfile = procmsg_get_message_file_path(msginfo);
- destfile = g_strdup_printf("%s%c%d", destdir, G_DIR_SEPARATOR,
- dest->last_num + 1);
+ destfile = mh_get_new_msg_filename(dest);
+ if (!destfile) break;
+ srcfile = procmsg_get_message_file(msginfo);
- if (is_file_exist(destfile)) {
- g_warning(_("%s already exists."), destfile);
- g_free(srcfile);
- g_free(destfile);
- break;
- }
-
- if (copy_file(srcfile, destfile) < 0) {
+ if (copy_file(srcfile, destfile, TRUE) < 0) {
FILE_OP_ERROR(srcfile, "copy");
g_free(srcfile);
g_free(destfile);
g_free(srcfile);
g_free(destfile);
dest->last_num++;
-
- if (fp) {
- MsgInfo newmsginfo;
-
- newmsginfo.msgnum = dest->last_num;
- newmsginfo.flags = msginfo->flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_FLAGS(newmsginfo.flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
- procmsg_write_flags(&newmsginfo, fp);
- }
}
- g_free(destdir);
- if (fp) fclose(fp);
-
return dest->last_num;
}
return FALSE;
}
-void mh_scan_folder(Folder *folder, FolderItem *item)
+gint mh_scan_folder(Folder *folder, FolderItem *item)
{
gchar *path;
DIR *dp;
struct stat s;
gint max = 0;
gint num;
- gint n_msg = 0;
- g_return_if_fail(item != NULL);
+ g_return_val_if_fail(item != NULL, -1);
+
+ debug_print("mh_scan_folder(): Scanning %s ...\n", item->path);
path = folder_item_get_path(item);
- g_return_if_fail(path != NULL);
+ g_return_val_if_fail(path != NULL, -1);
if (change_dir(path) < 0) {
g_free(path);
- return;
+ return -1;
}
g_free(path);
if ((dp = opendir(".")) == NULL) {
FILE_OP_ERROR(item->path, "opendir");
- return;
+ return -1;
}
if (folder->ui_func)
if ((num = to_number(d->d_name)) >= 0 &&
stat(d->d_name, &s) == 0 &&
S_ISREG(s.st_mode)) {
+/*
n_msg++;
+*/
if (max < num)
max = num;
}
}
-
closedir(dp);
+/*
if (n_msg == 0)
item->new = item->unread = item->total = 0;
else {
- gint new, unread, total;
+ gint new, unread, total, min, max;
- procmsg_get_mark_sum(".", &new, &unread, &total);
+ procmsg_get_mark_sum(".", &new, &unread, &total, &min, &max, 0);
if (n_msg > total) {
new += n_msg - total;
unread += n_msg - total;
item->unread = unread;
item->total = n_msg;
}
-
- debug_print(_("Last number in dir %s = %d\n"), item->path, max);
+*/
+ debug_print("Last number in dir %s = %d\n", item->path, max);
item->last_num = max;
+
+ return 0;
}
void mh_scan_tree(Folder *folder)
g_return_if_fail(folder != NULL);
- folder_tree_destroy(folder);
- item = folder_item_new(folder->name, NULL);
+ item = folder_item_new(folder, folder->name, NULL);
item->folder = folder;
folder->node = g_node_new(item);
}
g_free(rootpath);
+ mh_create_tree(folder);
mh_scan_tree_recursive(item);
}
"Can't create folder."), dir); \
return -1; \
} \
- if (mkdir(dir, S_IRWXU) < 0) { \
- FILE_OP_ERROR(dir, "mkdir"); \
+ if (make_dir(dir) < 0) \
return -1; \
- } \
- if (chmod(dir, S_IRWXU) < 0) \
- FILE_OP_ERROR(dir, "chmod"); \
} \
}
fullpath = g_strconcat(path, G_DIR_SEPARATOR_S, name, NULL);
g_free(path);
- if (mkdir(fullpath, S_IRWXU) < 0) {
- FILE_OP_ERROR(fullpath, "mkdir");
+ if (make_dir(fullpath) < 0) {
g_free(fullpath);
return NULL;
}
- if (chmod(fullpath, S_IRWXU) < 0)
- FILE_OP_ERROR(fullpath, "chmod");
g_free(fullpath);
NULL);
else
path = g_strdup(name);
- new_item = folder_item_new(name, path);
+ new_item = folder_item_new(folder, name, path);
folder_item_append(parent, new_item);
g_free(path);
return NULL;
}
- debug_print(_("\tSearching uncached messages... "));
+ debug_print("\tSearching uncached messages... ");
if (msg_table) {
while ((d = readdir(dp)) != NULL) {
closedir(dp);
if (n_newmsg)
- debug_print(_("%d uncached message(s) found.\n"), n_newmsg);
+ debug_print("%d uncached message(s) found.\n", n_newmsg);
else
- debug_print(_("done.\n"));
+ debug_print("done.\n");
/* sort new messages in numerical order */
if (newlist) {
- debug_print(_("\tSorting uncached messages in numerical order... "));
+ debug_print("\tSorting uncached messages in numerical order... ");
newlist = g_slist_sort
(newlist, (GCompareFunc)procmsg_cmp_msgnum_for_sort);
- debug_print(_("done.\n"));
+ debug_print("done.\n");
}
return newlist;
{
struct stat s;
MsgInfo *msginfo;
- MsgFlags flags = MSG_NEW|MSG_UNREAD;
+ MsgFlags flags;
+
+ flags.perm_flags = MSG_NEW|MSG_UNREAD;
+ flags.tmp_flags = 0;
g_return_val_if_fail(item != NULL, NULL);
g_return_val_if_fail(file != NULL, NULL);
if (item->stype == F_QUEUE) {
- MSG_SET_FLAGS(flags, MSG_QUEUED);
+ MSG_SET_TMP_FLAGS(flags, MSG_QUEUED);
} else if (item->stype == F_DRAFT) {
- MSG_SET_FLAGS(flags, MSG_DRAFT);
+ MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
}
- msginfo = procheader_parse(file, flags, FALSE);
+ msginfo = procheader_parse_file(file, flags, FALSE, FALSE);
if (!msginfo) return NULL;
msginfo->msgnum = atoi(file);
return msginfo;
}
+#if 0
static gboolean mh_is_maildir_one(const gchar *path, const gchar *dir)
{
gchar *entry;
mh_is_maildir_one(path, "cur") &&
mh_is_maildir_one(path, "tmp");
}
+#endif
static void mh_scan_tree_recursive(FolderItem *item)
{
if (S_ISDIR(s.st_mode)) {
FolderItem *new_item;
+#if 0
if (mh_is_maildir(entry)) {
g_free(entry);
continue;
}
+#endif
- new_item = folder_item_new(d->d_name, entry);
+ new_item = folder_item_new(item->folder, d->d_name, entry);
folder_item_append(item, new_item);
if (!item->path) {
- if (!strcmp(d->d_name, "inbox")) {
+ if (!strcmp(d->d_name, INBOX_DIR)) {
new_item->stype = F_INBOX;
item->folder->inbox = new_item;
- } else if (!strcmp(d->d_name, "outbox")) {
+ } else if (!strcmp(d->d_name, OUTBOX_DIR)) {
new_item->stype = F_OUTBOX;
item->folder->outbox = new_item;
- } else if (!strcmp(d->d_name, "draft")) {
+ } else if (!strcmp(d->d_name, DRAFT_DIR)) {
new_item->stype = F_DRAFT;
item->folder->draft = new_item;
- } else if (!strcmp(d->d_name, "queue")) {
+ } else if (!strcmp(d->d_name, QUEUE_DIR)) {
new_item->stype = F_QUEUE;
item->folder->queue = new_item;
- } else if (!strcmp(d->d_name, "trash")) {
+ } else if (!strcmp(d->d_name, TRASH_DIR)) {
new_item->stype = F_TRASH;
item->folder->trash = new_item;
}
closedir(dp);
+/*
if (item->path) {
- gint new, unread, total;
+ gint new, unread, total, min, max;
- procmsg_get_mark_sum(item->path, &new, &unread, &total);
+ procmsg_get_mark_sum(item->path, &new, &unread, &total,
+ &min, &max, 0);
if (n_msg > total) {
new += n_msg - total;
unread += n_msg - total;
item->unread = unread;
item->total = n_msg;
}
+*/
}
static gboolean mh_rename_folder_func(GNode *node, gpointer data)