0.9.3claws64
[claws.git] / src / mh.c
index 63e996fd6f51411c21dca78cd264df806c82eb2d..95cd75f1ccaaa63b6e6a97f1ced641208a4dd1bb 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
 #include "procheader.h"
 #include "utils.h"
 
-static void    mh_folder_init                  (Folder         *folder,
-                                                const gchar    *name,
-                                                const gchar    *path);
-
-static GSList  *mh_get_uncached_msgs           (GHashTable     *msg_table,
-                                                FolderItem     *item);
-static MsgInfo *mh_parse_msg                   (const gchar    *file,
-                                                FolderItem     *item);
-static void    mh_scan_tree_recursive          (FolderItem     *item, 
-                                                GHashTable *pptable);
-
-static gboolean mh_rename_folder_func          (GNode          *node,
-                                                gpointer        data);
-
+static void mh_folder_init(Folder * folder,
+                          const gchar * name, const gchar * path);
+
+static Folder *mh_folder_new(const gchar * name, const gchar * path);
+static void mh_folder_destroy(Folder * folder);
+static gchar *mh_fetch_msg(Folder * folder, FolderItem * item, gint num);
+static MsgInfo *mh_get_msginfo(Folder * folder,
+                              FolderItem * item, gint num);
+static gint mh_add_msg(Folder * folder,
+                      FolderItem * dest,
+                      const gchar * file,
+                      MsgFlags * flags);
+static gint mh_add_msgs(Folder * folder,
+                FolderItem * dest, GSList * file_list, GRelation *relation);
+static gint mh_copy_msg(Folder * folder,
+                       FolderItem * dest, MsgInfo * msginfo);
+static gint mh_remove_msg(Folder * folder, FolderItem * item, gint num);
+static gint mh_remove_all_msg(Folder * folder, FolderItem * item);
+static gboolean mh_is_msg_changed(Folder * folder,
+                                 FolderItem * item, MsgInfo * msginfo);
+
+static gint mh_get_num_list(Folder * folder,
+                           FolderItem * item, GSList ** list);
+static void mh_scan_tree(Folder * folder);
+
+static gint mh_create_tree(Folder * folder);
+static FolderItem *mh_create_folder(Folder * folder,
+                                   FolderItem * parent,
+                                   const gchar * name);
+static gint mh_rename_folder(Folder * folder,
+                            FolderItem * item, const gchar * name);
+static gint mh_remove_folder(Folder * folder, FolderItem * item);
+
+static 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);
+
+static gboolean mh_rename_folder_func(GNode * node, gpointer data);
+static gchar *mh_item_get_path(Folder *folder, FolderItem *item);
+
+FolderClass mh_class =
+{
+       F_MH,
+       "mh",
+       "MH",
+
+       /* Folder functions */
+       mh_folder_new,
+       mh_folder_destroy,
+       mh_scan_tree,
+       mh_create_tree,
+
+       /* FolderItem functions */
+       NULL,
+       NULL,
+       mh_item_get_path,
+       mh_create_folder,
+       mh_rename_folder,
+       mh_remove_folder,
+       NULL,
+       mh_get_num_list,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       
+       /* Message functions */
+       mh_get_msginfo,
+       NULL,
+       mh_fetch_msg,
+       mh_add_msg,
+       mh_add_msgs,
+       mh_copy_msg,
+       NULL,
+       mh_remove_msg,
+       mh_remove_all_msg,
+       mh_is_msg_changed,
+       NULL,
+};
+
+FolderClass *mh_get_class(void)
+{
+       return &mh_class;
+}
 
 Folder *mh_folder_new(const gchar *name, const gchar *path)
 {
        Folder *folder;
 
        folder = (Folder *)g_new0(MHFolder, 1);
+       folder->klass = &mh_class;
        mh_folder_init(folder, name, path);
 
        return folder;
 }
 
-void mh_folder_destroy(MHFolder *folder)
+static void mh_folder_destroy(Folder *folder)
 {
        folder_local_folder_destroy(LOCAL_FOLDER(folder));
 }
@@ -77,85 +149,85 @@ static void mh_folder_init(Folder *folder, const gchar *name, const gchar *path)
 {
        folder_local_folder_init(folder, name, path);
 
-       folder->type = F_MH;
-
-       folder->get_msg_list        = mh_get_msg_list;
-       folder->fetch_msg           = mh_fetch_msg;
-       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->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;
 }
 
-GSList *mh_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
+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 {
-               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 = 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);
 
-       return mlist;
+       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;
 }
 
 gchar *mh_fetch_msg(Folder *folder, FolderItem *item, gint num)
@@ -164,7 +236,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);
@@ -177,27 +249,47 @@ gchar *mh_fetch_msg(Folder *folder, FolderItem *item, gint num)
        return file;
 }
 
-gchar *mh_get_newmsg_filename(FolderItem *dest)
+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;
-       gboolean found = FALSE;
 
        destpath = folder_item_get_path(dest);
        g_return_val_if_fail(destpath != NULL, NULL);
+
        if (!is_dir_exist(destpath))
                make_dir_hier(destpath);
 
-       do {
+       for (;;) {
                destfile = g_strdup_printf("%s%c%d", destpath, G_DIR_SEPARATOR,
                                           dest->last_num + 1);
-               if(is_file_exist(destfile)) {
+               if (is_file_entry_exist(destfile)) {
                        dest->last_num++;
                        g_free(destfile);
-               } else {
-                       found = TRUE;
-               }
-       } while(!found);
+               } else
+                       break;
+       }
+
        g_free(destpath);
 
        return destfile;
@@ -219,289 +311,111 @@ gchar *mh_get_newmsg_filename(FolderItem *dest)
        procmsg_write_flags(&newmsginfo, fp); \
 }
 
-gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
-               gboolean remove_source)
+gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file, MsgFlags *flags)
 {
-       gchar *destfile;
+       gint ret;
+       GSList file_list;
+       MsgFileInfo fileinfo;
 
-       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);
-               if (dest->last_num < 0) return -1;
-       }
-
-       destfile = mh_get_newmsg_filename(dest);
-       if(!destfile) return -1;
+       fileinfo.file = (gchar *)file;
+       fileinfo.flags = flags;
+       file_list.data = &fileinfo;
+       file_list.next = NULL;
 
-       if (link(file, destfile) < 0) {
-               if (copy_file(file, destfile) < 0) {
-                       g_warning(_("can't copy message %s to %s\n"),
-                                 file, destfile);
-                       g_free(destfile);
-                       return -1;
-               }
-       }
-
-       if (remove_source) {
-               if (unlink(file) < 0)
-                       FILE_OP_ERROR(file, "unlink");
-       }
-
-       g_free(destfile);
-       dest->last_num++;
-       return dest->last_num;
-}
-
-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 (msginfo->folder == dest) {
-               g_warning(_("the src folder is identical to the dest.\n"));
-               return -1;
-       }
-
-       if (dest->last_num < 0) {
-               mh_scan_folder(folder, dest);
-               if (dest->last_num < 0) return -1;
-       }
-
-       prefs = dest->prefs;
-
-       destdir = folder_item_get_path(dest);
-
-       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(msginfo);
-
-       destfile = mh_get_newmsg_filename(dest);
-       if(!destfile) return -1;
-
-
-       if (move_file(srcfile, destfile) < 0) {
-               g_free(srcfile);
-               g_free(destfile);
-               g_free(destdir);
-               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 = procmsg_open_mark_file(destdir, TRUE)) == NULL)
-               g_warning(_("Can't open mark file.\n"));
-       else {
-               SET_DEST_MSG_FLAGS(fp, dest, msginfo);
-               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);
-       }
-       g_free(destdir);
-
-       return dest->last_num;
-}
-
-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);
-       }
+        ret = mh_add_msgs(folder, dest, &file_list, NULL);
+       return ret;
+} 
  
-       return ret;
-}
-
-static gint mh_do_move_msgs_with_dest(Folder *folder, FolderItem *dest,
-                                     GSList *msglist)
-{
-       gchar *destdir;
-       gchar *srcfile;
+gint mh_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list, 
+                 GRelation *relation)
+{ 
        gchar *destfile;
-       FILE *fp;
        GSList *cur;
-       MsgInfo *msginfo;
-       PrefsFolderItem *prefs;
+       MsgFileInfo *fileinfo;
 
        g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
+       g_return_val_if_fail(file_list != 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 = file_list; cur != NULL; cur = cur->next) {
+               fileinfo = (MsgFileInfo *)cur->data;
 
-       for (cur = msglist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
+               destfile = mh_get_new_msg_filename(dest);
+               if (destfile == NULL) return -1;
 
-               if (msginfo->folder == dest) {
-                       g_warning(_("the src folder is identical to the dest.\n"));
-                       continue;
-               }
-               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(msginfo);
-               destfile = mh_get_newmsg_filename(dest);
-               if(!destfile) return -1;
-
-               if (move_file(srcfile, destfile) < 0) {
-                       g_free(srcfile);
-                       g_free(destfile);
-                       break;
+               if (link(fileinfo->file, destfile) < 0) {
+                       if (copy_file(fileinfo->file, destfile, TRUE) < 0) {
+                               g_warning(_("can't copy message %s to %s\n"),
+                                         fileinfo->file, destfile);
+                               g_free(destfile);
+                               return -1;
+                       }
                }
+               if (relation != NULL)
+                       g_relation_insert(relation, fileinfo, GINT_TO_POINTER(dest->last_num + 1));
 
-               g_free(srcfile);
                g_free(destfile);
                dest->last_num++;
-
-               if (fp) {
-                       SET_DEST_MSG_FLAGS(fp, dest, msginfo);
-               }
        }
 
-       g_free(destdir);
-       if (fp) fclose(fp);
-
        return dest->last_num;
 }
 
-gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
-{
-       MsgInfo *msginfo;
-       GSList *cur;
-       gint ret = 0;
-
-       msginfo = (MsgInfo *)msglist->data;
-       if (folder == msginfo->folder->folder)
-               return mh_do_move_msgs_with_dest(folder, dest, msglist);
-
-       for (cur = msglist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-               ret = mh_move_msg(folder, dest, msginfo);
-               if (ret == -1) break;
-       }
-
-       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;
+       FolderItemPrefs *prefs;
 
        g_return_val_if_fail(dest != NULL, -1);
        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);
-
-       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(msginfo);
-       destfile = mh_get_newmsg_filename(dest);
-       if(!destfile) {
+       destfile = mh_get_new_msg_filename(dest);
+       if (!destfile) {
                g_free(srcfile);
-               if (fp) fclose(fp);
                return -1;
        }
        
-       dest->op_count--;
+       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);
-               g_free(destdir);
                return -1;
        }
 
+
        if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
                if (chmod(destfile, prefs->folder_chmod) < 0)
                        FILE_OP_ERROR(destfile, "chmod");
@@ -516,136 +430,6 @@ gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
        g_free(destfile);
        dest->last_num++;
 
-       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);
-
-               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);
-       }
-       g_free(destdir);
-
-       return dest->last_num;
-}
-
-/*
-gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
-{
-       Folder * src_folder;
-       gchar * filename;
-       gint num;
-       gchar * destdir;
-       FILE * fp;
-
-       src_folder = msginfo->folder->folder;
-       
-       g_return_val_if_fail(src_folder->fetch_msg != NULL, -1);
-       
-       filename = src_folder->fetch_msg(src_folder,
-                                        msginfo->folder,
-                                        msginfo->msgnum);
-       if (filename == NULL)
-               return -1;
-
-       num = folder->add_msg(folder, dest, filename, FALSE);
-
-       destdir = folder_item_get_path(dest);
-
-       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 num;
-}
-*/
-
-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(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
-
-       if (dest->last_num < 0) {
-               mh_scan_folder(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"));
-                       continue;
-               }
-               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(msginfo);
-               destfile = mh_get_newmsg_filename(dest);
-               if(!destfile) {
-                       g_free(srcfile);
-                       break;
-               }
-
-               if (copy_file(srcfile, destfile) < 0) {
-                       FILE_OP_ERROR(srcfile, "copy");
-                       g_free(srcfile);
-                       g_free(destfile);
-                       break;
-               }
-
-               g_free(srcfile);
-               g_free(destfile);
-               dest->last_num++;
-
-               if (fp) {
-                       SET_DEST_MSG_FLAGS(fp, dest, msginfo);
-               }
-       }
-
-       g_free(destdir);
-       if (fp) fclose(fp);
-
        return dest->last_num;
 }
 
@@ -695,79 +479,14 @@ gboolean mh_is_msg_changed(Folder *folder, FolderItem *item, MsgInfo *msginfo)
        return FALSE;
 }
 
-void mh_scan_folder(Folder *folder, FolderItem *item)
-{
-       gchar *path;
-       DIR *dp;
-       struct dirent *d;
-       struct stat s;
-       gint max = 0;
-       gint num;
-       gint n_msg = 0;
-
-       g_return_if_fail(item != NULL);
-
-       debug_print("mh_scan_folder(): 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;
-       }
-
-       if (folder->ui_func)
-               folder->ui_func(folder, item, folder->ui_func_data);
-
-       while ((d = readdir(dp)) != NULL) {
-               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, min, max;
-
-               procmsg_get_mark_sum(".", &new, &unread, &total, &min, &max, 0);
-               if (n_msg > total) {
-                       new += n_msg - total;
-                       unread += n_msg - total;
-               }
-               item->new = new;
-               item->unread = unread;
-               item->total = n_msg;
-       }
-
-       debug_print(_("Last number in dir %s = %d\n"), item->path, max);
-       item->last_num = max;
-}
-
 void mh_scan_tree(Folder *folder)
 {
        FolderItem *item;
        gchar *rootpath;
-       GHashTable *pptable;
 
        g_return_if_fail(folder != NULL);
 
-       pptable = folder_persist_prefs_new(folder);
-
-       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);
 
@@ -778,25 +497,20 @@ void mh_scan_tree(Folder *folder)
        }
        g_free(rootpath);
 
-       mh_scan_tree_recursive(item, pptable);
-       
-       folder_persist_prefs_free(pptable);
+       mh_create_tree(folder);
+       mh_scan_tree_recursive(item);
 }
 
 #define MAKE_DIR_IF_NOT_EXIST(dir) \
 { \
        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"); \
        } \
 }
 
@@ -821,31 +535,61 @@ gint mh_create_tree(Folder *folder)
 
 #undef MAKE_DIR_IF_NOT_EXIST
 
+gchar *mh_item_get_path(Folder *folder, FolderItem *item)
+{
+       gchar *folder_path, *path;
+
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+
+       folder_path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
+       g_return_val_if_fail(folder_path != NULL, NULL);
+
+        if (folder_path[0] == G_DIR_SEPARATOR) {
+                if (item->path)
+                        path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
+                                           item->path, NULL);
+                else
+                        path = g_strdup(folder_path);
+        } else {
+                if (item->path)
+                        path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                           folder_path, G_DIR_SEPARATOR_S,
+                                           item->path, NULL);
+                else
+                        path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                           folder_path, NULL);
+        }
+       g_free(folder_path);
+
+       return path;
+}
+
 FolderItem *mh_create_folder(Folder *folder, FolderItem *parent,
                             const gchar *name)
 {
        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);
 
@@ -854,8 +598,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;
@@ -934,104 +688,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;
@@ -1050,7 +706,7 @@ static MsgInfo *mh_parse_msg(const gchar *file, FolderItem *item)
                MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
        }
 
-       msginfo = procheader_parse(file, flags, FALSE, FALSE);
+       msginfo = procheader_parse_file(file, flags, FALSE, FALSE);
        if (!msginfo) return NULL;
 
        msginfo->msgnum = atoi(file);
@@ -1068,6 +724,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;
@@ -1091,8 +748,9 @@ 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, GHashTable *pptable)
+static void mh_scan_tree_recursive(FolderItem *item)
 {
        DIR *dp;
        struct dirent *d;
@@ -1134,33 +792,34 @@ static void mh_scan_tree_recursive(FolderItem *item, GHashTable *pptable)
                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;
                                }
                        }
-                       folder_item_restore_persist_prefs(new_item, pptable);
-                       mh_scan_tree_recursive(new_item, pptable);
+                       mh_scan_tree_recursive(new_item);
                } else if (to_number(d->d_name) != -1) n_msg++;
 
                g_free(entry);
@@ -1168,6 +827,7 @@ static void mh_scan_tree_recursive(FolderItem *item, GHashTable *pptable)
 
        closedir(dp);
 
+/*
        if (item->path) {
                gint new, unread, total, min, max;
 
@@ -1181,6 +841,7 @@ static void mh_scan_tree_recursive(FolderItem *item, GHashTable *pptable)
                item->unread = unread;
                item->total = n_msg;
        }
+*/
 }
 
 static gboolean mh_rename_folder_func(GNode *node, gpointer data)