when a 'protocol error' is encountered disconnect from the server
[claws.git] / src / news.c
index c0b14c49cba2107b5db350aa2c5056731c72d0a7..327fdcc2a1e3f10a97ecf467864ce65a97b5f7b2 100644 (file)
 #include "prefs_account.h"
 #include "inputdialog.h"
 #include "alertpanel.h"
+#include "log.h"
+#if USE_OPENSSL
+#  include "ssl.h"
+#endif
 
 #define NNTP_PORT      119
-#if USE_SSL
-#include "ssl.h"
-#define NNTPS_PORT 563
+#if USE_OPENSSL
+#define NNTPS_PORT     563
 #endif
 
 static void news_folder_init            (Folder        *folder,
                                          const gchar   *name,
                                          const gchar   *path);
 
-#if USE_SSL
+#if USE_OPENSSL
 static Session *news_session_new        (const gchar   *server,
                                          gushort        port,
                                          const gchar   *userid,
-                                         const gchar   *passwd, SSLType ssl_type);
+                                         const gchar   *passwd,
+                                         SSLType        ssl_type);
 #else
 static Session *news_session_new        (const gchar   *server,
                                          gushort        port,
@@ -77,9 +81,6 @@ static gint news_get_article_cmd       (NNTPSession   *session,
 static gint news_get_article            (NNTPSession   *session,
                                          gint           num,
                                          gchar         *filename);
-static gint news_get_header             (NNTPSession   *session,
-                                         gint           num,
-                                         gchar         *filename);
 
 static gint news_select_group           (NNTPSession   *session,
                                          const gchar   *group,
@@ -98,10 +99,24 @@ static GSList *news_delete_old_articles      (GSList        *alist,
                                          FolderItem    *item,
                                          gint           first);
 static void news_delete_all_articles    (FolderItem    *item);
+static void news_delete_expired_caches  (GSList        *alist,
+                                         FolderItem    *item);
 
 static gint news_remove_msg             (Folder        *folder, 
                                          FolderItem    *item, 
                                          gint           num);
+gint news_get_num_list                  (Folder        *folder, 
+                                         FolderItem    *item,
+                                         GSList       **list);
+MsgInfo *news_get_msginfo               (Folder        *folder, 
+                                         FolderItem    *item,
+                                         gint           num);
+GSList *news_get_msginfos               (Folder        *folder,
+                                         FolderItem    *item,
+                                         GSList        *msgnum_list);
+
+gint news_post_stream                   (Folder        *folder, 
+                                         FILE          *fp);
 
 Folder *news_folder_new(const gchar *name, const gchar *path)
 {
@@ -113,27 +128,43 @@ Folder *news_folder_new(const gchar *name, const gchar *path)
        return folder;
 }
 
-void news_folder_destroy(NewsFolder *folder)
+void news_folder_destroy(Folder *folder)
 {
+       gchar *dir;
+
+       dir = folder_get_path(folder);
+       if (is_dir_exist(dir))
+               remove_dir_recursive(dir);
+       g_free(dir);
+
        folder_remote_folder_destroy(REMOTE_FOLDER(folder));
 }
 
 static void news_folder_init(Folder *folder, const gchar *name,
                             const gchar *path)
 {
-       folder_remote_folder_init(folder, name, path);
-
        folder->type = F_NEWS;
 
+       folder_remote_folder_init(folder, name, path);
+
+/*
        folder->get_msg_list = news_get_article_list;
+*/
        folder->fetch_msg    = news_fetch_msg;
+/*
        folder->scan         = news_scan_group;
+*/
+       folder->destroy      = news_folder_destroy;
        folder->remove_msg   = news_remove_msg;
+       folder->get_num_list = news_get_num_list;
+       folder->get_msginfo  = news_get_msginfo;
+       folder->get_msginfos = news_get_msginfos;
 }
 
-#if USE_SSL
+#if USE_OPENSSL
 static Session *news_session_new(const gchar *server, gushort port,
-                                const gchar *userid, const gchar *passwd, SSLType ssl_type)
+                                const gchar *userid, const gchar *passwd,
+                                SSLType ssl_type)
 #else
 static Session *news_session_new(const gchar *server, gushort port,
                                 const gchar *userid, const gchar *passwd)
@@ -147,16 +178,16 @@ static Session *news_session_new(const gchar *server, gushort port,
 
        log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
 
+#if USE_OPENSSL
        if (userid && passwd)
-#if USE_SSL
-               nntp_sock = nntp_open_auth(server, port, buf, userid, passwd, ssl_type);
-#else
-               nntp_sock = nntp_open_auth(server, port, buf, userid, passwd);
-#endif
+               nntp_sock = nntp_open_auth(server, port, buf, userid, passwd,
+                                          ssl_type);
        else
-#if USE_SSL
                nntp_sock = nntp_open(server, port, buf, ssl_type);
 #else
+       if (userid && passwd)
+               nntp_sock = nntp_open_auth(server, port, buf, userid, passwd);
+       else
                nntp_sock = nntp_open(server, port, buf);
 #endif
 
@@ -172,18 +203,21 @@ static Session *news_session_new(const gchar *server, gushort port,
        SESSION(session)->phase            = SESSION_READY;
        SESSION(session)->last_access_time = time(NULL);
        SESSION(session)->data             = NULL;
+
+       SESSION(session)->destroy          = news_session_destroy;
+
        session->group = NULL;
 
        return SESSION(session);
 }
 
-void news_session_destroy(NNTPSession *session)
+void news_session_destroy(Session *session)
 {
-       nntp_close(session->nntp_sock);
-       session->nntp_sock = NULL;
-       SESSION(session)->sock = NULL;
+       nntp_close(NNTP_SESSION(session)->nntp_sock);
+       NNTP_SESSION(session)->nntp_sock = NULL;
+       session->sock = NULL;
 
-       g_free(session->group);
+       g_free(NNTP_SESSION(session)->group);
 }
 
 static Session *news_session_new_for_folder(Folder *folder)
@@ -192,22 +226,13 @@ static Session *news_session_new_for_folder(Folder *folder)
        PrefsAccount *ac;
        const gchar *userid = NULL;
        gchar *passwd = NULL;
-       int port;
+       gushort port;
+       gchar buf[NNTPBUFSIZE];
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(folder->account != NULL, NULL);
 
        ac = folder->account;
-
-#if USE_SSL
-       if (ac->set_nntpport) {
-                port = ac->nntpport;
-       } else {
-                port = ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
-       }
-#else
-       port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;
-#endif
        if (ac->use_nntp_auth && ac->userid && ac->userid[0]) {
                userid = ac->userid;
                if (ac->passwd && ac->passwd[0])
@@ -217,15 +242,18 @@ static Session *news_session_new_for_folder(Folder *folder)
                                                             userid);
        }
 
-#if USE_SSL
-       session = news_session_new(ac->nntp_server,
-                                  port, 
-                                  userid, passwd, ac->ssl_nntp);
+#if USE_OPENSSL
+       port = ac->set_nntpport ? ac->nntpport
+               : ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
+       session = news_session_new(ac->nntp_server, port, userid, passwd,
+                                  ac->ssl_nntp);
 #else
-       session = news_session_new(ac->nntp_server,
-                                  port, 
-                                  userid, passwd);
+       port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;
+       session = news_session_new(ac->nntp_server, port, userid, passwd);
 #endif
+       if (ac->use_nntp_auth && ac->use_nntp_auth_onconnect)
+               nntp_forceauth(NNTP_SESSION(session)->nntp_sock, buf, userid, passwd);
+
        g_free(passwd);
 
        return session;
@@ -241,20 +269,18 @@ NNTPSession *news_session_get(Folder *folder)
 
        if (!rfolder->session) {
                rfolder->session = news_session_new_for_folder(folder);
-               statusbar_pop_all();
                return NNTP_SESSION(rfolder->session);
        }
 
        if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
                rfolder->session->last_access_time = time(NULL);
-               statusbar_pop_all();
                return NNTP_SESSION(rfolder->session);
        }
 
        if (nntp_mode(NNTP_SESSION(rfolder->session)->nntp_sock, FALSE)
            != NN_SUCCESS) {
-               log_warning(_("NNTP connection to %s:%d has been"
-                             " disconnected. Reconnecting...\n"),
+               log_warning("NNTP connection to %s:%d has been"
+                             " disconnected. Reconnecting...\n",
                            folder->account->nntp_server,
                            folder->account->set_nntpport ?
                            folder->account->nntpport : NNTP_PORT);
@@ -264,7 +290,6 @@ NNTPSession *news_session_get(Folder *folder)
 
        if (rfolder->session)
                rfolder->session->last_access_time = time(NULL);
-       statusbar_pop_all();
        return NNTP_SESSION(rfolder->session);
 }
 
@@ -282,7 +307,7 @@ GSList *news_get_article_list(Folder *folder, FolderItem *item,
 
        if (!session) {
                alist = procmsg_read_cache(item, FALSE);
-               item->last_num = procmsg_get_last_num_in_cache(alist);
+               item->last_num = procmsg_get_last_num_in_msg_list(alist);
        } else if (use_cache) {
                GSList *newlist;
                gint cache_last;
@@ -290,12 +315,20 @@ GSList *news_get_article_list(Folder *folder, FolderItem *item,
 
                alist = procmsg_read_cache(item, FALSE);
 
-               cache_last = procmsg_get_last_num_in_cache(alist);
+               cache_last = procmsg_get_last_num_in_msg_list(alist);
                newlist = news_get_uncached_articles
                        (session, item, cache_last, &first, &last);
-               alist = news_delete_old_articles(alist, item, first);
+               if (first == 0 && last == 0) {
+                       news_delete_all_articles(item);
+                       procmsg_msg_list_free(alist);
+                       alist = NULL;
+               } else {
+                       alist = news_delete_old_articles(alist, item, first);
+                       news_delete_expired_caches(alist, item);
+               }
 
                alist = g_slist_concat(alist, newlist);
+
                item->last_num = last;
        } else {
                gint last;
@@ -308,8 +341,6 @@ GSList *news_get_article_list(Folder *folder, FolderItem *item,
 
        procmsg_set_flags(alist, item);
 
-       statusbar_pop_all();
-
        return alist;
 }
 
@@ -329,7 +360,7 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
        g_free(path);
 
        if (is_file_exist(filename)) {
-               debug_print(_("article %d has been already cached.\n"), num);
+               debug_print("article %d has been already cached.\n", num);
                return filename;
        }
 
@@ -340,19 +371,19 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
        }
 
        ok = news_select_group(session, item->path, NULL, NULL, NULL);
-       statusbar_pop_all();
        if (ok != NN_SUCCESS) {
-               g_warning(_("can't select group %s\n"), item->path);
+               g_warning("can't select group %s\n", item->path);
                g_free(filename);
                return NULL;
        }
 
-       debug_print(_("getting article %d...\n"), num);
+       debug_print("getting article %d...\n", num);
        ok = news_get_article(NNTP_SESSION(REMOTE_FOLDER(folder)->session),
                              num, filename);
-       statusbar_pop_all();
        if (ok < 0) {
-               g_warning(_("can't read article %d\n"), num);
+               g_warning("can't read article %d\n", num);
+               session_destroy(SESSION(session));
+               REMOTE_FOLDER(folder)->session = NULL;
                g_free(filename);
                return NULL;
        }
@@ -364,9 +395,6 @@ gint news_scan_group(Folder *folder, FolderItem *item)
 {
        NNTPSession *session;
        gint num = 0, first = 0, last = 0;
-       gint new = 0, unread = 0, total = 0;
-       gint min = 0, max = 0;
-       gchar *path;
        gint ok;
 
        g_return_val_if_fail(folder != NULL, -1);
@@ -377,7 +405,7 @@ gint news_scan_group(Folder *folder, FolderItem *item)
 
        ok = news_select_group(session, item->path, &num, &first, &last);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't set group: %s\n"), item->path);
+               log_warning("can't set group: %s\n", item->path);
                return -1;
        }
 
@@ -386,6 +414,7 @@ gint news_scan_group(Folder *folder, FolderItem *item)
                return 0;
        }
 
+/*
        path = folder_item_get_path(item);
        if (path && is_dir_exist(path)) {
                procmsg_get_mark_sum(path, &new, &unread, &total, &min, &max,
@@ -398,10 +427,6 @@ gint news_scan_group(Folder *folder, FolderItem *item)
        else {
                if (min < first)
                        min = first;
-               else if (first < min) {
-                       num -= min - first;
-                       first = min;
-               }
 
                if (last < max)
                        max = last;
@@ -418,7 +443,7 @@ gint news_scan_group(Folder *folder, FolderItem *item)
        item->unread = unread;
        item->total = num;
        item->last_num = last;
-
+*/
        return 0;
 }
 
@@ -476,12 +501,10 @@ GSList *news_get_group_list(Folder *folder)
 
                if (nntp_list(session->nntp_sock) != NN_SUCCESS) {
                        g_free(filename);
-                       statusbar_pop_all();
                        return NULL;
                }
-               statusbar_pop_all();
                if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
-                       log_warning(_("can't retrieve newsgroup list\n"));
+                       log_warning("can't retrieve newsgroup list\n");
                        session_destroy(SESSION(session));
                        REMOTE_FOLDER(folder)->session = NULL;
                        g_free(filename);
@@ -527,8 +550,6 @@ GSList *news_get_group_list(Folder *folder)
 
        list = g_slist_sort(list, (GCompareFunc)news_group_info_compare);
 
-       statusbar_pop_all();
-
        return list;
 }
 
@@ -563,7 +584,6 @@ void news_remove_group_list_cache(Folder *folder)
 
 gint news_post(Folder *folder, const gchar *file)
 {
-       NNTPSession *session;
        FILE *fp;
        gint ok;
 
@@ -571,24 +591,36 @@ gint news_post(Folder *folder, const gchar *file)
        g_return_val_if_fail(folder->type == F_NEWS, -1);
        g_return_val_if_fail(file != NULL, -1);
 
-       session = news_session_get(folder);
-       if (!session) return -1;
-
        if ((fp = fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return -1;
        }
 
+       ok = news_post_stream(folder, fp);
+
+       fclose(fp);
+
+       return ok;
+}
+
+gint news_post_stream(Folder *folder, FILE *fp)
+{
+       NNTPSession *session;
+       gint ok;
+
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(folder->type == F_NEWS, -1);
+       g_return_val_if_fail(fp != NULL, -1);
+
+       session = news_session_get(folder);
+       if (!session) return -1;
+
        ok = nntp_post(session->nntp_sock, fp);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't post article.\n"));
+               log_warning("can't post article.\n");
                return -1;
        }
 
-       fclose(fp);
-
-       statusbar_pop_all();
-
        return 0;
 }
 
@@ -605,7 +637,7 @@ static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
        g_free(msgid);
 
        if (recv_write_to_file(session->nntp_sock->sock, filename) < 0) {
-               log_warning(_("can't retrieve article %d\n"), num);
+               log_warning("can't retrieve article %d\n", num);
                return -1;
        }
 
@@ -614,22 +646,13 @@ static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
 
 static gint news_remove_msg(Folder *folder, FolderItem *item, gint num)
 {
-       MsgInfo * msginfo;
-       gchar * filename;
-       MsgFlags msgflags = { 0, 0 };
+       gchar * dir;
        gint r;
 
-       filename = folder_item_fetch_msg(item, num);
-       if (filename == NULL)
-               return -1;
-
-       msginfo = procheader_parse(filename, msgflags, FALSE, FALSE);
-       if (msginfo == NULL)
-               return -1;
-
-       r = news_cancel_article(folder, msginfo);
-
-       procmsg_msginfo_free(msginfo);
+       dir = folder_item_get_path(item);
+       debug_print("news_remove_msg: removing msg %d in %s\n",num,dir);
+       r = remove_numbered_files(dir, num, num);
+       g_free(dir);
 
        return r;
 }
@@ -639,11 +662,6 @@ static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
        return news_get_article_cmd(session, "ARTICLE", num, filename);
 }
 
-static gint news_get_header(NNTPSession *session, gint num, gchar *filename)
-{
-       return news_get_article_cmd(session, "HEAD", num, filename);
-}
-
 /**
  * news_select_group:
  * @session: Active NNTP session.
@@ -692,8 +710,8 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        GSList *llast = NULL;
        MsgInfo *msginfo;
 
-       if (rfirst) *rfirst = 0;
-       if (rlast)  *rlast  = 0;
+       if (rfirst) *rfirst = -1;
+       if (rlast)  *rlast  = -1;
 
        g_return_val_if_fail(session != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
@@ -702,30 +720,31 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
 
        ok = news_select_group(session, item->path, &num, &first, &last);
        if (ok != NN_SUCCESS) {
-               log_warning(_("can't set group: %s\n"), item->path);
+               log_warning("can't set group: %s\n", item->path);
                return NULL;
        }
 
        /* calculate getting overview range */
        if (first > last) {
-               log_warning(_("invalid article range: %d - %d\n"),
+               log_warning("invalid article range: %d - %d\n",
                            first, last);
                return NULL;
        }
+
+       if (rfirst) *rfirst = first;
+       if (rlast)  *rlast  = last;
+
        if (cache_last < first)
                begin = first;
        else if (last < cache_last)
                begin = first;
        else if (last == cache_last) {
-               debug_print(_("no new articles.\n"));
+               debug_print("no new articles.\n");
                return NULL;
        } else
                begin = cache_last + 1;
        end = last;
 
-       if (rfirst) *rfirst = first;
-       if (rlast)  *rlast  = last;
-
        if (prefs_common.max_articles > 0 &&
            end - begin + 1 > prefs_common.max_articles)
                begin = end - prefs_common.max_articles + 1;
@@ -733,13 +752,13 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        log_message(_("getting xover %d - %d in %s...\n"),
                    begin, end, item->path);
        if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
-               log_warning(_("can't get xover\n"));
+               log_warning("can't get xover\n");
                return NULL;
        }
 
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
-                       log_warning(_("error occurred while getting xover.\n"));
+                       log_warning("error occurred while getting xover.\n");
                        return newlist;
                }
 
@@ -747,7 +766,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
 
                msginfo = news_parse_xover(buf);
                if (!msginfo) {
-                       log_warning(_("invalid xover line: %s\n"), buf);
+                       log_warning("invalid xover line: %s\n", buf);
                        continue;
                }
 
@@ -765,7 +784,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        }
 
        if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
-               log_warning(_("can't get xhdr\n"));
+               log_warning("can't get xhdr\n");
                return newlist;
        }
 
@@ -773,7 +792,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
 
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
-                       log_warning(_("error occurred while getting xhdr.\n"));
+                       log_warning("error occurred while getting xhdr.\n");
                        return newlist;
                }
 
@@ -790,7 +809,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
        }
 
        if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
-               log_warning(_("can't get xhdr\n"));
+               log_warning("can't get xhdr\n");
                return newlist;
        }
 
@@ -798,7 +817,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session,
 
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
-                       log_warning(_("error occurred while getting xhdr.\n"));
+                       log_warning("error occurred while getting xhdr.\n");
                        return newlist;
                }
 
@@ -855,7 +874,7 @@ static MsgInfo *news_parse_xover(const gchar *xover_str)
        line_int = atoi(line);
 
        /* set MsgInfo */
-       msginfo = g_new0(MsgInfo, 1);
+       msginfo = procmsg_msginfo_new();
        msginfo->msgnum = num;
        msginfo->size = size_int;
 
@@ -930,7 +949,7 @@ static GSList *news_delete_old_articles(GSList *alist, FolderItem *item,
 
        if (first < 2) return alist;
 
-       debug_print(_("Deleting cached articles 1 - %d ... "), first - 1);
+       debug_print("Deleting cached articles 1 - %d ...\n", first - 1);
 
        dir = folder_item_get_path(item);
        remove_numbered_files(dir, 1, first - 1);
@@ -959,13 +978,26 @@ static void news_delete_all_articles(FolderItem *item)
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->folder->type == F_NEWS);
 
-       debug_print(_("\tDeleting all cached articles... "));
+       debug_print("Deleting all cached articles...\n");
 
        dir = folder_item_get_path(item);
        remove_all_numbered_files(dir);
        g_free(dir);
+}
 
-       debug_print(_("done.\n"));
+static void news_delete_expired_caches(GSList *alist, FolderItem *item)
+{
+       gchar *dir;
+
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+       g_return_if_fail(item->folder->type == F_NEWS);
+
+       debug_print("Deleting expired cached articles...\n");
+
+       dir = folder_item_get_path(item);
+       remove_expired_files(dir, 24 * 7);
+       g_free(dir);
 }
 
 gint news_cancel_article(Folder * folder, MsgInfo * msginfo)
@@ -985,7 +1017,7 @@ gint news_cancel_article(Folder * folder, MsgInfo * msginfo)
        }
        if (change_file_mode_rw(tmpfp, tmp) < 0) {
                FILE_OP_ERROR(tmp, "chmod");
-               g_warning(_("can't change file mode\n"));
+               g_warning("can't change file mode\n");
        }
        
        fprintf(tmpfp, "From: %s\r\n", msginfo->from);
@@ -1008,3 +1040,257 @@ gint news_cancel_article(Folder * folder, MsgInfo * msginfo)
 
        return 0;
 }
+
+gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
+{
+       NNTPSession *session;
+       gint i, ok, num, first, last, nummsgs = 0;
+       gchar *dir;
+
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->folder != NULL, -1);
+       g_return_val_if_fail(item->folder->type == F_NEWS, -1);
+
+       session = news_session_get(folder);
+       g_return_val_if_fail(session != NULL, -1);
+
+       ok = news_select_group(session, item->path, &num, &first, &last);
+       if (ok != NN_SUCCESS) {
+               log_warning(_("can't set group: %s\n"), item->path);
+               return -1;
+       }
+
+       if(last < first) {
+               log_warning(_("invalid article range: %d - %d\n"),
+                           first, last);
+               return 0;
+       }
+
+       for(i = first; i <= last; i++) {
+               *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(i));
+               nummsgs++;
+       }
+
+       dir = folder_item_get_path(item);
+       debug_print("removing old messages from %d to %d in %s\n", first, last, dir);
+       remove_numbered_files(dir, 1, first - 1);
+       g_free(dir);
+
+       return nummsgs;
+}
+
+#define READ_TO_LISTEND(hdr) \
+       while (!(buf[0] == '.' && buf[1] == '\r')) { \
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) { \
+                       log_warning(_("error occurred while getting %s.\n"), hdr); \
+                       return msginfo; \
+               } \
+       }
+
+MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
+{
+       NNTPSession *session;
+       MsgInfo *msginfo = NULL;
+       gchar buf[NNTPBUFSIZE];
+
+       session = news_session_get(folder);
+       g_return_val_if_fail(session != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->folder != NULL, NULL);
+       g_return_val_if_fail(item->folder->type == F_NEWS, NULL);
+
+       log_message(_("getting xover %d in %s...\n"),
+                   num, item->path);
+       if (nntp_xover(session->nntp_sock, num, num) != NN_SUCCESS) {
+               log_warning(_("can't get xover\n"));
+               return NULL;
+       }
+       
+       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               log_warning(_("error occurred while getting xover.\n"));
+               return NULL;
+       }
+       
+       msginfo = news_parse_xover(buf);
+       if (!msginfo) {
+               log_warning(_("invalid xover line: %s\n"), buf);
+       }
+
+       READ_TO_LISTEND("xover");
+
+       if(!msginfo)
+               return NULL;
+       
+       msginfo->folder = item;
+       msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
+       msginfo->flags.tmp_flags = MSG_NEWS;
+       msginfo->newsgroups = g_strdup(item->path);
+
+       if (nntp_xhdr(session->nntp_sock, "to", num, num) != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+               return msginfo;
+       }
+
+       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               log_warning(_("error occurred while getting xhdr.\n"));
+               return msginfo;
+       }
+
+       msginfo->to = news_parse_xhdr(buf, msginfo);
+
+       READ_TO_LISTEND("xhdr (to)");
+
+       if (nntp_xhdr(session->nntp_sock, "cc", num, num) != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+               return msginfo;
+       }
+
+       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               log_warning(_("error occurred while getting xhdr.\n"));
+               return msginfo;
+       }
+
+       msginfo->cc = news_parse_xhdr(buf, msginfo);
+
+       READ_TO_LISTEND("xhdr (cc)");
+
+       return msginfo;
+}
+
+static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *item, guint begin, guint end)
+{
+       gchar buf[NNTPBUFSIZE];
+       GSList *newlist = NULL;
+       GSList *llast = NULL;
+       MsgInfo *msginfo;
+
+       g_return_val_if_fail(session != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+
+       log_message(_("getting xover %d - %d in %s...\n"),
+                   begin, end, item->path);
+       if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
+               log_warning(_("can't get xover\n"));
+               return NULL;
+       }
+
+       for (;;) {
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+                       log_warning(_("error occurred while getting xover.\n"));
+                       return newlist;
+               }
+
+               if (buf[0] == '.' && buf[1] == '\r') break;
+
+               msginfo = news_parse_xover(buf);
+               if (!msginfo) {
+                       log_warning(_("invalid xover line: %s\n"), buf);
+                       continue;
+               }
+
+               msginfo->folder = item;
+               msginfo->flags.perm_flags = MSG_NEW|MSG_UNREAD;
+               msginfo->flags.tmp_flags = MSG_NEWS;
+               msginfo->newsgroups = g_strdup(item->path);
+
+               if (!newlist)
+                       llast = newlist = g_slist_append(newlist, msginfo);
+               else {
+                       llast = g_slist_append(llast, msginfo);
+                       llast = llast->next;
+               }
+       }
+
+       if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+               return newlist;
+       }
+
+       llast = newlist;
+
+       for (;;) {
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+                       log_warning(_("error occurred while getting xhdr.\n"));
+                       return newlist;
+               }
+
+               if (buf[0] == '.' && buf[1] == '\r') break;
+               if (!llast) {
+                       g_warning("llast == NULL\n");
+                       continue;
+               }
+
+               msginfo = (MsgInfo *)llast->data;
+               msginfo->to = news_parse_xhdr(buf, msginfo);
+
+               llast = llast->next;
+       }
+
+       if (nntp_xhdr(session->nntp_sock, "cc", begin, end) != NN_SUCCESS) {
+               log_warning(_("can't get xhdr\n"));
+               return newlist;
+       }
+
+       llast = newlist;
+
+       for (;;) {
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+                       log_warning(_("error occurred while getting xhdr.\n"));
+                       return newlist;
+               }
+
+               if (buf[0] == '.' && buf[1] == '\r') break;
+               if (!llast) {
+                       g_warning("llast == NULL\n");
+                       continue;
+               }
+
+               msginfo = (MsgInfo *)llast->data;
+               msginfo->cc = news_parse_xhdr(buf, msginfo);
+
+               llast = llast->next;
+       }
+
+       return newlist;
+}
+
+gint news_fetch_msgnum_sort(gconstpointer a, gconstpointer b)
+{
+       return (GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b));
+}
+
+GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
+{
+       NNTPSession *session;
+       GSList *elem, *msginfo_list = NULL, *tmp_msgnum_list, *tmp_msginfo_list;
+       guint first, last, next;
+       
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(folder->type == F_NEWS, NULL);
+       g_return_val_if_fail(msgnum_list != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+       
+       session = news_session_get(folder);
+       g_return_val_if_fail(session != NULL, NULL);
+
+       tmp_msgnum_list = g_slist_copy(msgnum_list);
+       tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, news_fetch_msgnum_sort);
+
+       first = GPOINTER_TO_INT(tmp_msgnum_list->data);
+       last = first;
+       for(elem = g_slist_next(tmp_msgnum_list); elem != NULL; elem = g_slist_next(elem)) {
+               next = GPOINTER_TO_INT(elem->data);
+               if(next != (last + 1)) {
+                       tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
+                       msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
+                       first = next;
+               }
+               last = next;
+       }
+       tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
+       msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
+
+       g_slist_free(tmp_msgnum_list);
+       
+       return msginfo_list;
+}