/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 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 "inputdialog.h"
#include "alertpanel.h"
+#define NNTP_PORT 119
+
+static Session *news_session_new (const gchar *server,
+ gushort port,
+ const gchar *userid,
+ const gchar *passwd);
+
static gint news_get_article_cmd (NNTPSession *session,
const gchar *cmd,
gint num,
gchar *filename);
static gint news_select_group (NNTPSession *session,
- const char *group);
+ const gchar *group);
static GSList *news_get_uncached_articles(NNTPSession *session,
FolderItem *item,
gint cache_last,
gint *rfirst,
gint *rlast);
static MsgInfo *news_parse_xover (const gchar *xover_str);
-static gchar * news_parse_xhdr (const gchar *xover_str,
- MsgInfo * info);
-static GSList *news_delete_old_article (GSList *alist,
+static gchar *news_parse_xhdr (const gchar *xhdr_str,
+ MsgInfo *msginfo);
+static GSList *news_delete_old_articles (GSList *alist,
+ FolderItem *item,
gint first);
-static void news_delete_all_article (FolderItem *item);
+static void news_delete_all_articles (FolderItem *item);
static Session *news_session_new(const gchar *server, gushort port,
g_free(session->group);
}
-static gchar *news_query_password(const gchar *server,
- const gchar *user)
+static gchar *news_query_password(const gchar *server, const gchar *user)
{
gchar *message;
gchar *pass;
message = g_strdup_printf(_("Input password for %s on %s:"),
user, server);
-
- pass = input_dialog_with_invisible(_("Input password"),
- message, NULL);
+ pass = input_dialog_with_invisible(_("Input password"), message, NULL);
g_free(message);
-/* manage_window_focus_in(inc_dialog->mainwin->window, */
-/* NULL, NULL); */
+
return pass;
}
{
Session *session;
PrefsAccount *ac;
- const gchar *userid;
- gchar *passwd;
+ const gchar *userid = NULL;
+ gchar *passwd = NULL;
ac = folder->account;
if (ac->use_nntp_auth && ac->userid && ac->userid[0]) {
userid = ac->userid;
if (ac->passwd && ac->passwd[0])
passwd = g_strdup(ac->passwd);
- else {
+ else
passwd = news_query_password(ac->nntp_server, userid);
- if (!passwd)
- userid = NULL;
- }
- } else {
- userid = passwd = NULL;
}
- session = news_session_new(ac->nntp_server, 119, userid, passwd);
+
+ session = news_session_new(ac->nntp_server, NNTP_PORT, userid, passwd);
g_free(passwd);
+
return session;
}
if (!REMOTE_FOLDER(folder)->session) {
REMOTE_FOLDER(folder)->session =
news_session_new_for_folder(folder);
- } else {
- session = NNTP_SESSION(REMOTE_FOLDER(folder)->session);
- if (nntp_mode(session->nntp_sock, FALSE) != NN_SUCCESS) {
- log_warning(_("NNTP connection to %s:%d has been"
- " disconnected. Reconnecting...\n"),
- folder->account->nntp_server, 119);
- session_destroy(REMOTE_FOLDER(folder)->session);
- REMOTE_FOLDER(folder)->session =
- news_session_new_for_folder(folder);
- }
+ return NNTP_SESSION(REMOTE_FOLDER(folder)->session);
+ }
+
+ session = NNTP_SESSION(REMOTE_FOLDER(folder)->session);
+
+ if (nntp_mode(session->nntp_sock, FALSE) != NN_SUCCESS) {
+ log_warning(_("NNTP connection to %s:%d has been"
+ " disconnected. Reconnecting...\n"),
+ folder->account->nntp_server, NNTP_PORT);
+ session_destroy(REMOTE_FOLDER(folder)->session);
+ REMOTE_FOLDER(folder)->session =
+ news_session_new_for_folder(folder);
}
return NNTP_SESSION(REMOTE_FOLDER(folder)->session);
cache_last = procmsg_get_last_num_in_cache(alist);
newlist = news_get_uncached_articles
(session, item, cache_last, &first, &last);
- alist = news_delete_old_article(alist, first);
+ alist = news_delete_old_articles(alist, item, first);
alist = g_slist_concat(alist, newlist);
item->last_num = last;
alist = news_get_uncached_articles
(session, item, 0, NULL, &last);
- news_delete_all_article(item);
+ news_delete_all_articles(item);
item->last_num = last;
}
g_return_val_if_fail(item != NULL, NULL);
path = folder_item_get_path(item);
+ if (!is_dir_exist(path))
+ make_dir_hier(path);
+
filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
g_free(path);
* news_select_group:
* @session: Active NNTP session.
* @group: Newsgroup name.
- *
+ *
* Select newsgroup @group with the GROUP command if it is not already
* selected in @session.
- *
+ *
* Return value: NNTP result code.
**/
-static gint news_select_group(NNTPSession *session,
- const char *group)
+static gint news_select_group(NNTPSession *session, const gchar *group)
{
gint ok;
gint num, first, last;
- if (g_strcasecmp(session->group, group) == 0)
+ if (session->group && g_strcasecmp(session->group, group) == 0)
return NN_SUCCESS;
g_free(session->group);
session->group = NULL;
ok = nntp_group(session->nntp_sock, group, &num, &first, &last);
-
if (ok == NN_SUCCESS)
session->group = g_strdup(group);
log_warning(_("can't set group: %s\n"), item->path);
return NULL;
}
-
session->group = g_strdup(item->path);
/* calculate getting overview range */
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;
msginfo->folder = item;
msginfo->flags = MSG_NEW|MSG_UNREAD|MSG_NEWS;
+ msginfo->newsgroups = g_strdup(item->path);
if (!newlist)
llast = newlist = g_slist_append(newlist, msginfo);
if (nntp_xhdr(session->nntp_sock, "to", begin, end) != NN_SUCCESS) {
log_warning(_("can't get xhdr\n"));
- return NULL;
+ return newlist;
}
llast = newlist;
for (;;) {
- gchar * value;
-
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
- log_warning(_("error occurred while getting xover.\n"));
+ 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;
-
- value = news_parse_xhdr(buf, msginfo);
-
- if (value)
- msginfo->to = value;
+ 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 NULL;
+ return newlist;
}
llast = newlist;
for (;;) {
- gchar * value;
-
if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
- log_warning(_("error occurred while getting xover.\n"));
+ 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;
-
- value = news_parse_xhdr(buf, msginfo);
-
- if (value)
- msginfo->cc = value;
+ msginfo = (MsgInfo *)llast->data;
+ msginfo->cc = news_parse_xhdr(buf, msginfo);
llast = llast->next;
}
- if (rfirst) *rfirst = first;
- if (rlast) *rlast = last;
return newlist;
}
if (*msgid != '\0')
msginfo->msgid = g_strdup(msgid);
+ msginfo->references = g_strdup(ref);
eliminate_parenthesis(ref, '(', ')');
if ((p = strrchr(ref, '<')) != NULL) {
extract_parenthesis(p, '<', '>');
return msginfo;
}
-static gchar * news_parse_xhdr(const gchar *xover_str, MsgInfo * info)
+static gchar *news_parse_xhdr(const gchar *xhdr_str, MsgInfo *msginfo)
{
gchar buf[NNTPBUFSIZE];
gchar *p;
+ gchar *tmp;
gint num;
- p = strchr(xover_str, ' ');
+ p = strchr(xhdr_str, ' ');
if (!p)
return NULL;
else
p++;
- num = atoi(xover_str);
+ num = atoi(xhdr_str);
+ if (msginfo->msgnum != num) return NULL;
- if (info->msgnum != num)
- return NULL;
+ tmp = strchr(p, '\r');
+ if (!tmp) tmp = strchr(p, '\n');
- return g_strdup(p);
+ if (tmp)
+ return g_strndup(p, tmp - p);
+ else
+ return g_strdup(p);
}
-static GSList *news_delete_old_article(GSList *alist, gint first)
+static GSList *news_delete_old_articles(GSList *alist, FolderItem *item,
+ gint first)
{
GSList *cur, *next;
MsgInfo *msginfo;
- gchar *cache_file;
+ gchar *dir;
+
+ g_return_val_if_fail(item != NULL, alist);
+ g_return_val_if_fail(item->folder != NULL, alist);
+ g_return_val_if_fail(item->folder->type == F_NEWS, alist);
if (first < 2) return alist;
+ debug_print(_("Deleting cached articles 1 - %d ... "), first - 1);
+
+ dir = folder_item_get_path(item);
+ remove_numbered_files(dir, 1, first - 1);
+ g_free(dir);
+
for (cur = alist; cur != NULL; ) {
next = cur->next;
msginfo = (MsgInfo *)cur->data;
if (msginfo && msginfo->msgnum < first) {
- debug_print(_("deleting article %d...\n"),
- msginfo->msgnum);
-
- cache_file = procmsg_get_message_file_path(msginfo);
- if (is_file_exist(cache_file)) unlink(cache_file);
- g_free(cache_file);
-
procmsg_msginfo_free(msginfo);
alist = g_slist_remove(alist, msginfo);
}
return alist;
}
-static void news_delete_all_article(FolderItem *item)
+static void news_delete_all_articles(FolderItem *item)
{
- DIR *dp;
- struct dirent *d;
gchar *dir;
- gchar *file;
- dir = folder_item_get_path(item);
- if ((dp = opendir(dir)) == NULL) {
- FILE_OP_ERROR(dir, "opendir");
- g_free(dir);
- return;
- }
+ g_return_if_fail(item != NULL);
+ g_return_if_fail(item->folder != NULL);
+ g_return_if_fail(item->folder->type == F_NEWS);
debug_print(_("\tDeleting all cached articles... "));
- while ((d = readdir(dp)) != NULL) {
- if (to_number(d->d_name) < 0) continue;
-
- file = g_strconcat(dir, G_DIR_SEPARATOR_S, d->d_name, NULL);
-
- if (is_file_exist(file)) {
- if (unlink(file) < 0)
- FILE_OP_ERROR(file, "unlink");
- }
-
- g_free(file);
- }
-
- closedir(dp);
+ dir = folder_item_get_path(item);
+ if (!is_dir_exist(dir))
+ make_dir_hier(dir);
+ remove_all_numbered_files(dir);
g_free(dir);
debug_print(_("done.\n"));
debug_print(_("\tDeleting cached group list... "));
path = folder_item_get_path(item);
+ if (!is_dir_exist(path))
+ make_dir_hier(path);
+
filename = g_strconcat(path, G_DIR_SEPARATOR_S, GROUPLIST_FILE, NULL);
g_free(path);
if (remove(filename) != 0)
projects / claws.git / blobdiff