0.8.11claws7
[claws.git] / src / mh.c
index b9996810f6a34443649599d82f659862d2629ceb..2a9ea0237b98b6a735e468f92d9209d7b2f45acd 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -1,6 +1,6 @@
 /*
  * 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 GSList  *mh_get_uncached_msgs           (GHashTable     *msg_table,
-                                                FolderItem     *item);
+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_get_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 MsgInfo *mh_parse_msg                   (const gchar    *file,
                                                 FolderItem     *item);
 static void    mh_scan_tree_recursive          (FolderItem     *item);
@@ -53,62 +108,149 @@ static gboolean mh_rename_folder_func             (GNode          *node,
                                                 gpointer        data);
 
 
-GSList *mh_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
+FolderClass mh_class =
+{
+       F_MH,
+       "mh",
+
+       /* Folder functions */
+       mh_folder_new,
+       mh_folder_destroy,
+       mh_scan_tree,
+       mh_create_tree,
+
+       /* FolderItem functions */
+       NULL,
+       NULL,
+       mh_create_folder,
+       mh_rename_folder,
+       mh_remove_folder,
+       mh_get_num_list,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       
+       /* Message functions */
+       mh_get_msginfo,
+       NULL,
+       mh_fetch_msg,
+       mh_add_msg,
+       mh_move_msg,
+       mh_move_msgs_with_dest,
+       mh_copy_msg,
+       mh_copy_msgs_with_dest,
+       mh_remove_msg,
+       NULL,
+       mh_remove_all_msg,
+       mh_is_msg_changed,
+       NULL,
+};
+
+FolderClass *mh_get_class()
+{
+       return &mh_class;
+}
+
+Folder *mh_folder_new(const gchar *name, const gchar *path)
+{
+       Folder *folder;
+
+       folder = (Folder *)g_new0(MHFolder, 1);
+       folder->class = &mh_class;
+       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_local_folder_init(folder, name, path);
+
+}
+
+void mh_get_last_num(Folder *folder, FolderItem *item)
 {
-       GSList *mlist;
-       GHashTable *msg_table;
        gchar *path;
+       DIR *dp;
+       struct dirent *d;
        struct stat s;
-       gboolean scan_new = TRUE;
-#ifdef MEASURE_TIME
-       struct timeval tv_before, tv_after, tv_result;
+       gint max = 0;
+       gint num;
 
-       gettimeofday(&tv_before, NULL);
-#endif
+       g_return_if_fail(item != NULL);
 
-       g_return_val_if_fail(item != NULL, NULL);
+       debug_print("mh_get_last_num(): Scanning %s ...\n", item->path);
 
        path = folder_item_get_path(item);
-       if (stat(path, &s) < 0) {
-               FILE_OP_ERROR(path, "stat");
-       } else {
-               if (item->mtime == s.st_mtime) {
-                       debug_print("Folder is not modified.\n");
-                       scan_new = FALSE;
-               } else
-                       item->mtime = s.st_mtime;
+       g_return_if_fail(path != NULL);
+       if (change_dir(path) < 0) {
+               g_free(path);
+               return;
        }
        g_free(path);
 
-       if (use_cache && !scan_new) {
-               mlist = procmsg_read_cache(item, FALSE);
-               if (!mlist)
-                       mlist = mh_get_uncached_msgs(NULL, item);
-       } else if (use_cache) {
-               GSList *newlist;
+       if ((dp = opendir(".")) == NULL) {
+               FILE_OP_ERROR(item->path, "opendir");
+               return;
+       }
 
-               mlist = procmsg_read_cache(item, TRUE);
-               msg_table = procmsg_msg_hash_table_create(mlist);
+       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);
 
-               newlist = mh_get_uncached_msgs(msg_table, item);
-               if (msg_table)
-                       g_hash_table_destroy(msg_table);
+       debug_print("Last number in dir %s = %d\n", item->path, max);
+       item->last_num = max;
+}
 
-               mlist = g_slist_concat(mlist, newlist);
-       } else
-               mlist = mh_get_uncached_msgs(NULL, item);
+gint mh_get_num_list(Folder *folder, FolderItem *item, GSList **list)
+{
 
-       procmsg_set_flags(mlist, item);
+       gchar *path;
+       DIR *dp;
+       struct dirent *d;
+       struct stat s;
+       gint num, nummsgs = 0;
 
-#ifdef MEASURE_TIME
-       gettimeofday(&tv_after, NULL);
+       g_return_val_if_fail(item != NULL, -1);
 
-       timersub(&tv_after, &tv_before, &tv_result);
-       g_print("mh_get_msg_list: %s: elapsed time: %ld.%06ld sec\n",
-               item->path, tv_result.tv_sec, tv_result.tv_usec);
-#endif
+       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 mlist;
+       return nummsgs;
 }
 
 gchar *mh_fetch_msg(Folder *folder, FolderItem *item, gint num)
@@ -117,7 +259,7 @@ gchar *mh_fetch_msg(Folder *folder, FolderItem *item, gint num)
        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);
@@ -130,31 +272,87 @@ gchar *mh_fetch_msg(Folder *folder, FolderItem *item, gint num)
        return file;
 }
 
+MsgInfo *mh_get_msginfo(Folder *folder, FolderItem *item, gint num)
+{
+       MsgInfo *msginfo;
+       gchar *file;
+
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(num > 0, NULL);
+
+       file = mh_fetch_msg(folder, item, num);
+       if (!file) return NULL;
+
+       msginfo = mh_parse_msg(file, item);
+       if (msginfo)
+               msginfo->msgnum = num;
+
+       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 (copy_file(file, destfile) < 0) {
-                       g_warning(_("can't copy message %s to %s\n"),
+               if (copy_file(file, destfile, TRUE) < 0) {
+                       g_warning("can't copy message %s to %s\n",
                                  file, destfile);
                        g_free(destfile);
                        return -1;
@@ -171,12 +369,10 @@ gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
        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;
 
@@ -184,33 +380,29 @@ gint mh_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
        g_return_val_if_fail(msginfo != NULL, -1);
 
        if (msginfo->folder == dest) {
-               g_warning(_("the src folder is identical to the dest.\n"));
+               g_warning("the src folder is identical to the dest.\n");
                return -1;
        }
 
        if (dest->last_num < 0) {
-               mh_scan_folder(folder, dest);
+               mh_get_last_num(folder, dest);
                if (dest->last_num < 0) return -1;
        }
 
        prefs = dest->prefs;
 
-       destdir = folder_item_get_path(dest);
-       if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
-               g_warning(_("Can't open mark file.\n"));
+       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;
        }
 
@@ -228,46 +420,39 @@ gint mh_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
        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_PERM_FLAGS(newmsginfo.flags,
-                                            MSG_NEW|MSG_UNREAD|MSG_DELETED);
-
-               procmsg_write_flags(&newmsginfo, fp);
-
-               if (filemode) {
-#if HAVE_FCHMOD
-                       fchmod(fileno(fp), filemode);
-#else
-                       gchar *markfile;
-
-                       markfile = folder_item_get_mark_file(dest);
-                       if (markfile) {
-                               chmod(markfile, filemode);
-                               g_free(markfile);
-                       }
-#endif
-               }
-
-               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)
+               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;
@@ -276,32 +461,28 @@ gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
        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;
        }
 
        prefs = dest->prefs;
 
-       destdir = folder_item_get_path(dest);
-       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;
 
                if (msginfo->folder == dest) {
-                       g_warning(_("the src folder is identical to the dest.\n"));
+                       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;
@@ -310,36 +491,34 @@ gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
                g_free(srcfile);
                g_free(destfile);
                dest->last_num++;
+       }
 
-               if (fp) {
-                       MsgInfo newmsginfo;
+       return dest->last_num;
+}
 
-                       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);
+gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
+{
+       MsgInfo *msginfo;
+       GSList *cur;
+       gint ret = 0;
 
-                       procmsg_write_flags(&newmsginfo, fp);
-               }
-       }
+       msginfo = (MsgInfo *)msglist->data;
+       if (folder == msginfo->folder->folder)
+               return mh_do_move_msgs_with_dest(folder, dest, msglist);
 
-       g_free(destdir);
-       if (fp) fclose(fp);
+       for (cur = msglist; cur != NULL; cur = cur->next) {
+               msginfo = (MsgInfo *)cur->data;
+               ret = mh_move_msg(folder, dest, msginfo);
+               if (ret == -1) break;
+       }
 
-       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;
 
@@ -347,50 +526,44 @@ gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
        g_return_val_if_fail(msginfo != NULL, -1);
 
        if (msginfo->folder == dest) {
-               g_warning(_("the src folder is identical to the dest.\n"));
+               g_warning("the src folder is identical to the dest.\n");
                return -1;
        }
 
        if (dest->last_num < 0) {
-               mh_scan_folder(folder, dest);
+               mh_get_last_num(folder, dest);
                if (dest->last_num < 0) return -1;
        }
 
        prefs = dest->prefs;
 
-       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"));
-
-       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);
-
-       dest->op_count--;
-
-       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 ((MSG_IS_QUEUED(msginfo->flags) || MSG_IS_DRAFT(msginfo->flags))
+       &&  dest->stype != F_QUEUE && dest->stype != F_DRAFT) {
+               if (procmsg_remove_special_headers(srcfile, destfile) !=0) {
+                       g_free(srcfile);
+                       g_free(destfile);
+                       return -1;
+               }
+       } else 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");
@@ -405,36 +578,6 @@ gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
        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_PERM_FLAGS(newmsginfo.flags,
-                                            MSG_NEW|MSG_UNREAD|MSG_DELETED);
-               procmsg_write_flags(&newmsginfo, fp);
-
-               if (filemode) {
-#if HAVE_FCHMOD
-                       fchmod(fileno(fp), filemode);
-#else
-                       gchar *markfile;
-
-                       markfile = folder_item_get_mark_file(dest);
-                       if (markfile) {
-                               chmod(markfile, filemode);
-                               g_free(markfile);
-                       }
-#endif
-               }
-
-               fclose(fp);
-       }
-
        return dest->last_num;
 }
 
@@ -460,8 +603,6 @@ gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
        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;
@@ -485,10 +626,8 @@ gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
 
 gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
 {
-       gchar *destdir;
        gchar *srcfile;
        gchar *destfile;
-       FILE *fp;
        GSList *cur;
        MsgInfo *msginfo;
 
@@ -496,40 +635,26 @@ gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
        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;
 
                if (msginfo->folder == dest) {
-                       g_warning(_("the src folder is identical to the dest.\n"));
+                       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);
@@ -539,26 +664,8 @@ gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
                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_PERM_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;
 }
 
@@ -608,7 +715,7 @@ gboolean mh_is_msg_changed(Folder *folder, FolderItem *item, MsgInfo *msginfo)
        return FALSE;
 }
 
-void mh_scan_folder(Folder *folder, FolderItem *item)
+gint mh_scan_folder(Folder *folder, FolderItem *item)
 {
        gchar *path;
        DIR *dp;
@@ -616,23 +723,22 @@ void mh_scan_folder(Folder *folder, FolderItem *item)
        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)
@@ -642,20 +748,22 @@ void mh_scan_folder(Folder *folder, FolderItem *item)
                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;
@@ -664,9 +772,11 @@ void mh_scan_folder(Folder *folder, FolderItem *item)
                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)
@@ -676,8 +786,7 @@ 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);
 
@@ -688,6 +797,7 @@ void mh_scan_tree(Folder *folder)
        }
        g_free(rootpath);
 
+       mh_create_tree(folder);
        mh_scan_tree_recursive(item);
 }
 
@@ -695,16 +805,12 @@ void mh_scan_tree(Folder *folder)
 { \
        if (!is_dir_exist(dir)) { \
                if (is_file_exist(dir)) { \
-                       g_warning(_("File `%s' already exists.\n" \
-                                   "Can't create folder."), dir); \
+                       g_warning("File `%s' already exists.\n" \
+                                   "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"); \
        } \
 }
 
@@ -735,25 +841,25 @@ FolderItem *mh_create_folder(Folder *folder, FolderItem *parent,
        gchar *path;
        gchar *fullpath;
        FolderItem *new_item;
+       gchar *mh_sequences_filename;
+       FILE *mh_sequences_file;
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(parent != NULL, NULL);
        g_return_val_if_fail(name != NULL, NULL);
 
        path = folder_item_get_path(parent);
-       if (!is_dir_exist(path))
-               make_dir_hier(path);
-
+       if (!is_dir_exist(path)) 
+               if (make_dir_hier(path) != 0)
+                       return NULL;
+               
        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);
 
@@ -762,8 +868,18 @@ FolderItem *mh_create_folder(Folder *folder, FolderItem *parent,
                                   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);
+
+       path = folder_item_get_path(new_item);
+       mh_sequences_filename = g_strconcat(path, G_DIR_SEPARATOR_S,
+                                           ".mh_sequences", NULL);
+       if ((mh_sequences_file = fopen(mh_sequences_filename, "a+b")) != NULL) {
+               fclose(mh_sequences_file);
+       }
+       g_free(mh_sequences_filename);
        g_free(path);
 
        return new_item;
@@ -842,104 +958,6 @@ gint mh_remove_folder(Folder *folder, FolderItem *item)
        return 0;
 }
 
-
-static GSList *mh_get_uncached_msgs(GHashTable *msg_table, FolderItem *item)
-{
-       gchar *path;
-       DIR *dp;
-       struct dirent *d;
-       struct stat s;
-       GSList *newlist = NULL;
-       GSList *last = NULL;
-       MsgInfo *msginfo;
-       gint n_newmsg = 0;
-       gint num;
-
-       g_return_val_if_fail(item != NULL, NULL);
-
-       path = folder_item_get_path(item);
-       g_return_val_if_fail(path != NULL, NULL);
-       if (change_dir(path) < 0) {
-               g_free(path);
-               return NULL;
-       }
-       g_free(path);
-
-       if ((dp = opendir(".")) == NULL) {
-               FILE_OP_ERROR(item->path, "opendir");
-               return NULL;
-       }
-
-       debug_print(_("\tSearching uncached messages... "));
-
-       if (msg_table) {
-               while ((d = readdir(dp)) != NULL) {
-                       if ((num = to_number(d->d_name)) < 0) continue;
-                       if (stat(d->d_name, &s) < 0) {
-                               FILE_OP_ERROR(d->d_name, "stat");
-                               continue;
-                       }
-                       if (!S_ISREG(s.st_mode)) continue;
-
-                       msginfo = g_hash_table_lookup
-                               (msg_table, GUINT_TO_POINTER(num));
-
-                       if (!msginfo) {
-                               /* not found in the cache (uncached message) */
-                               msginfo = mh_parse_msg(d->d_name, item);
-                               if (!msginfo) continue;
-
-                               if (!newlist)
-                                       last = newlist =
-                                               g_slist_append(NULL, msginfo);
-                               else {
-                                       last = g_slist_append(last, msginfo);
-                                       last = last->next;
-                               }
-                               n_newmsg++;
-                       }
-               }
-       } else {
-               /* discard all previous cache */
-               while ((d = readdir(dp)) != NULL) {
-                       if (to_number(d->d_name) < 0) continue;
-                       if (stat(d->d_name, &s) < 0) {
-                               FILE_OP_ERROR(d->d_name, "stat");
-                               continue;
-                       }
-                       if (!S_ISREG(s.st_mode)) continue;
-
-                       msginfo = mh_parse_msg(d->d_name, item);
-                       if (!msginfo) continue;
-
-                       if (!newlist)
-                               last = newlist = g_slist_append(NULL, msginfo);
-                       else {
-                               last = g_slist_append(last, msginfo);
-                               last = last->next;
-                       }
-                       n_newmsg++;
-               }
-       }
-
-       closedir(dp);
-
-       if (n_newmsg)
-               debug_print(_("%d uncached message(s) found.\n"), n_newmsg);
-       else
-               debug_print(_("done.\n"));
-
-       /* sort new messages in numerical order */
-       if (newlist) {
-               debug_print(_("\tSorting uncached messages in numerical order... "));
-               newlist = g_slist_sort
-                       (newlist, (GCompareFunc)procmsg_cmp_msgnum_for_sort);
-               debug_print(_("done.\n"));
-       }
-
-       return newlist;
-}
-
 static MsgInfo *mh_parse_msg(const gchar *file, FolderItem *item)
 {
        struct stat s;
@@ -958,7 +976,7 @@ static MsgInfo *mh_parse_msg(const gchar *file, FolderItem *item)
                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);
@@ -976,6 +994,7 @@ static MsgInfo *mh_parse_msg(const gchar *file, FolderItem *item)
        return msginfo;
 }
 
+#if 0
 static gboolean mh_is_maildir_one(const gchar *path, const gchar *dir)
 {
        gchar *entry;
@@ -999,6 +1018,7 @@ static gboolean mh_is_maildir(const gchar *path)
               mh_is_maildir_one(path, "cur") &&
               mh_is_maildir_one(path, "tmp");
 }
+#endif
 
 static void mh_scan_tree_recursive(FolderItem *item)
 {
@@ -1042,27 +1062,29 @@ 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;
                                }
@@ -1075,10 +1097,12 @@ static void mh_scan_tree_recursive(FolderItem *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;
@@ -1087,6 +1111,7 @@ static void mh_scan_tree_recursive(FolderItem *item)
                item->unread = unread;
                item->total = n_msg;
        }
+*/
 }
 
 static gboolean mh_rename_folder_func(GNode *node, gpointer data)