/*
* 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 "config.h"
#endif
+#include "defs.h"
+
#include <glib.h>
#include <stdio.h>
#include <string.h>
#include <dirent.h>
#include <unistd.h>
-#include "defs.h"
#include "intl.h"
#include "news.h"
#include "nntp.h"
#include "inputdialog.h"
#include "alertpanel.h"
-static gint news_get_article_cmd (Folder *folder,
- NNTPSession *session,
+#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_get_article (Folder *folder,
- NNTPSession *session,
+static gint news_get_article (NNTPSession *session,
gint num,
gchar *filename);
-static gint news_get_header (Folder *folder,
- NNTPSession *session,
+static gint news_get_header (NNTPSession *session,
gint num,
gchar *filename);
+static gint news_select_group (NNTPSession *session,
+ 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 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 gchar *news_query_password (NNTPSession *session,
- const gchar *user);
-static gint news_authenticate (Folder *folder);
-static gint news_nntp_group (Folder *folder,
- SockInfo *sock,
- const gchar *group,
- gint *num,
- gint *first,
- gint *last);
-static gint news_nntp_list (Folder *folder,
- SockInfo *sock);
-static gint news_nntp_xover (Folder *folder,
- SockInfo *sock,
- gint first,
- gint last);
-static gint news_nntp_post (Folder *folder,
- SockInfo *sock,
- FILE *fp);
-static gint news_nntp_mode (Folder *folder,
- SockInfo *sock,
- gboolean stream);
-
-Session *news_session_new(const gchar *server, gushort port)
+static void news_delete_all_articles (FolderItem *item);
+
+
+static Session *news_session_new(const gchar *server, gushort port,
+ const gchar *userid, const gchar *passwd)
{
gchar buf[NNTPBUFSIZE];
NNTPSession *session;
- SockInfo *nntp_sock;
+ NNTPSockInfo *nntp_sock;
g_return_val_if_fail(server != NULL, NULL);
log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
- if ((nntp_sock = nntp_open(server, port, buf)) < 0)
+ if (userid && passwd)
+ nntp_sock = nntp_open_auth(server, port, buf, userid, passwd);
+ else
+ nntp_sock = nntp_open(server, port, buf);
+ if (nntp_sock == NULL)
return NULL;
session = g_new(NNTPSession, 1);
SESSION(session)->type = SESSION_NEWS;
SESSION(session)->server = g_strdup(server);
- SESSION(session)->sock = nntp_sock;
+ session->nntp_sock = nntp_sock;
+ SESSION(session)->sock = nntp_sock->sock;
SESSION(session)->connected = TRUE;
SESSION(session)->phase = SESSION_READY;
SESSION(session)->data = NULL;
void news_session_destroy(NNTPSession *session)
{
- sock_close(SESSION(session)->sock);
+ nntp_close(session->nntp_sock);
+ session->nntp_sock = NULL;
SESSION(session)->sock = NULL;
g_free(session->group);
}
+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);
+ g_free(message);
+
+ return pass;
+}
+
+static Session *news_session_new_for_folder(Folder *folder)
+{
+ Session *session;
+ PrefsAccount *ac;
+ const gchar *userid = NULL;
+ gchar *passwd = NULL;
+
+ g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(folder->account != NULL, 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
+ passwd = news_query_password(ac->nntp_server, userid);
+ }
+
+ session = news_session_new(ac->nntp_server,
+ ac->set_nntpport ? ac->nntpport : NNTP_PORT,
+ userid, passwd);
+ g_free(passwd);
+
+ return session;
+}
+
NNTPSession *news_session_get(Folder *folder)
{
+ NNTPSession *session;
+
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(folder->type == F_NEWS, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
if (!REMOTE_FOLDER(folder)->session) {
REMOTE_FOLDER(folder)->session =
- news_session_new(folder->account->nntp_server, 119);
- } else {
- if (news_nntp_mode(folder,
- REMOTE_FOLDER(folder)->session->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(folder->account->nntp_server,
- 119);
- }
+ news_session_new_for_folder(folder);
+ statusbar_pop_all();
+ 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,
+ folder->account->set_nntpport ?
+ folder->account->nntpport : NNTP_PORT);
+ session_destroy(REMOTE_FOLDER(folder)->session);
+ REMOTE_FOLDER(folder)->session =
+ news_session_new_for_folder(folder);
}
+ statusbar_pop_all();
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;
}
gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
{
gchar *path, *filename;
+ NNTPSession *session;
gint ok;
g_return_val_if_fail(folder != NULL, NULL);
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);
return filename;
}
- if (!REMOTE_FOLDER(folder)->session) {
+ session = news_session_get(folder);
+ if (!session) {
+ g_free(filename);
+ return NULL;
+ }
+
+ ok = news_select_group(session, item->path);
+ statusbar_pop_all();
+ if (ok != NN_SUCCESS) {
+ g_warning(_("can't select group %s\n"), item->path);
g_free(filename);
return NULL;
}
debug_print(_("getting article %d...\n"), num);
- ok = news_get_article(folder,
- NNTP_SESSION(REMOTE_FOLDER(folder)->session),
+ ok = news_get_article(NNTP_SESSION(REMOTE_FOLDER(folder)->session),
num, filename);
statusbar_pop_all();
if (ok < 0) {
{
}
+GSList *news_get_group_list(Folder *folder)
+{
+ gchar *path, *filename;
+ FILE *fp;
+ GSList *list = NULL;
+ GSList *last = NULL;
+ gchar buf[NNTPBUFSIZE];
+
+ g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(folder->type == F_NEWS, NULL);
+
+ path = folder_item_get_path(FOLDER_ITEM(folder->node->data));
+ filename = g_strconcat(path, G_DIR_SEPARATOR_S, NEWSGROUP_LIST, NULL);
+ g_free(path);
+
+ if ((fp = fopen(filename, "r")) == NULL) {
+ NNTPSession *session;
+
+ session = news_session_get(folder);
+ if (!session) {
+ g_free(filename);
+ return NULL;
+ }
+
+ 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"));
+ g_free(filename);
+ return NULL;
+ }
+
+ if ((fp = fopen(filename, "r")) == NULL) {
+ FILE_OP_ERROR(filename, "fopen");
+ g_free(filename);
+ return NULL;
+ }
+ }
+
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ gchar *p = buf;
+ while (*p != '\0' && *p != ' ') p++;
+ *p = '\0';
+ if (!last)
+ last = list = g_slist_append(NULL, g_strdup(buf));
+ else {
+ last = g_slist_append(last, g_strdup(buf));
+ last = last->next;
+ }
+ }
+
+ fclose(fp);
+ g_free(filename);
+
+ list = g_slist_sort(list, (GCompareFunc)g_strcasecmp);
+
+ statusbar_pop_all();
+
+ return list;
+}
+
+void news_remove_group_list(Folder *folder)
+{
+ gchar *path, *filename;
+
+ g_return_if_fail(folder != NULL);
+ g_return_if_fail(folder->type == F_NEWS);
+
+ path = folder_item_get_path(FOLDER_ITEM(folder->node->data));
+ filename = g_strconcat(path, G_DIR_SEPARATOR_S, NEWSGROUP_LIST, NULL);
+ g_free(path);
+
+ if (is_file_exist(filename)) {
+ if (remove(filename) < 0)
+ FILE_OP_ERROR(filename, "remove");
+ }
+ g_free(filename);
+}
+
gint news_post(Folder *folder, const gchar *file)
{
NNTPSession *session;
return -1;
}
- ok = news_nntp_post(folder, SESSION(session)->sock, fp);
+ ok = nntp_post(session->nntp_sock, fp);
if (ok != NN_SUCCESS) {
log_warning(_("can't post article.\n"));
return -1;
return 0;
}
-static gint news_get_article_cmd(Folder *folder, NNTPSession *session,
- const gchar *cmd,
+static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
gint num, gchar *filename)
{
- gint ok;
gchar *msgid;
- ok = nntp_get_article(SESSION(session)->sock, cmd, num, &msgid);
- if (ok == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return -1;
- ok = nntp_get_article(SESSION(session)->sock, cmd, num,
- &msgid);
- }
- if (ok != NN_SUCCESS)
+ if (nntp_get_article(session->nntp_sock, cmd, num, &msgid)
+ != NN_SUCCESS)
return -1;
debug_print("Message-Id = %s, num = %d\n", msgid, num);
g_free(msgid);
- if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
+ if (recv_write_to_file(session->nntp_sock->sock, filename) < 0) {
log_warning(_("can't retrieve article %d\n"), num);
return -1;
}
return 0;
}
-static gint news_get_article(Folder *folder, NNTPSession *session,
- gint num, gchar *filename)
+static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
{
- return news_get_article_cmd(folder, session, "ARTICLE", num, filename);
+ return news_get_article_cmd(session, "ARTICLE", num, filename);
}
-static gint news_get_header(Folder *folder, NNTPSession *session,
- gint num, gchar *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.
+ * @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 gchar *group)
{
- return news_get_article_cmd(folder, session, "HEAD", num, filename);
+ gint ok;
+ gint num, first, last;
+
+ 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);
+
+ return ok;
}
static GSList *news_get_uncached_articles(NNTPSession *session,
g_return_val_if_fail(item->folder != NULL, NULL);
g_return_val_if_fail(item->folder->type == F_NEWS, NULL);
- ok = news_nntp_group(item->folder, SESSION(session)->sock, item->path,
- &num, &first, &last);
+ g_free(session->group);
+ session->group = NULL;
+
+ ok = nntp_group(session->nntp_sock, item->path,
+ &num, &first, &last);
if (ok != NN_SUCCESS) {
log_warning(_("can't set group: %s\n"), item->path);
return NULL;
}
+ session->group = g_strdup(item->path);
/* calculate getting overview range */
if (first > last) {
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;
log_message(_("getting xover %d - %d in %s...\n"),
begin, end, item->path);
- if (news_nntp_xover(item->folder, SESSION(session)->sock,
- begin, end) != NN_SUCCESS) {
+ if (nntp_xover(session->nntp_sock, begin, end) != NN_SUCCESS) {
log_warning(_("can't get xover\n"));
return NULL;
}
for (;;) {
- if (sock_read(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+ if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
log_warning(_("error occurred while getting xover.\n"));
return newlist;
}
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 (rfirst) *rfirst = first;
- if (rlast) *rlast = last;
+ 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;
}
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 GSList *news_delete_old_article(GSList *alist, gint first)
+static gchar *news_parse_xhdr(const gchar *xhdr_str, MsgInfo *msginfo)
+{
+ gchar *p;
+ gchar *tmp;
+ gint num;
+
+ p = strchr(xhdr_str, ' ');
+ if (!p)
+ return NULL;
+ else
+ p++;
+
+ num = atoi(xhdr_str);
+ if (msginfo->msgnum != num) return NULL;
+
+ tmp = strchr(p, '\r');
+ if (!tmp) tmp = strchr(p, '\n');
+
+ if (tmp)
+ return g_strndup(p, tmp - p);
+ else
+ return g_strdup(p);
+}
+
+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"));
}
-
-/*
- news_get_group_list returns a strings list.
- These strings are the names of the newsgroups of a server.
- item is the FolderItem of the news server.
- The names of the newsgroups are cached into a file so that
- when the function is called again, there is no need to make
- a request to the server.
- */
-
-GSList * news_get_group_list(FolderItem *item)
-{
- gchar *path, *filename;
- gint ok;
- NNTPSession *session;
- GSList * group_list = NULL;
- FILE * f;
- gchar buf[NNTPBUFSIZE];
- int len;
-
- if (item == NULL)
- return NULL;
-
- 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);
-
- session = news_session_get(item->folder);
-
- if (session == NULL)
- return NULL;
-
- if (is_file_exist(filename)) {
- debug_print(_("group list has been already cached.\n"));
- }
- else {
- ok = news_nntp_list(item->folder, SESSION(session)->sock);
- if (ok != NN_SUCCESS)
- return NULL;
-
- if (recv_write_to_file(SESSION(session)->sock, filename) < 0) {
- log_warning(_("can't retrieve group list\n"));
- return NULL;
- }
- }
-
- f = fopen(filename, "r");
- while (fgets(buf, NNTPBUFSIZE, f)) {
- char * s;
-
- len = 0;
- while ((buf[len] != 0) && (buf[len] != ' '))
- len++;
- buf[len] = 0;
- s = g_strdup(buf);
-
- group_list = g_slist_append(group_list, s);
- }
- fclose(f);
- g_free(filename);
-
- group_list = g_slist_sort(group_list, (GCompareFunc) g_strcasecmp);
-
- return group_list;
-}
-
-/*
- remove the cache file of the names of the newsgroups.
- */
-
-void news_reset_group_list(FolderItem *item)
-{
- gchar *path, *filename;
-
- debug_print(_("\tDeleting cached group list... "));
- path = folder_item_get_path(item);
- filename = g_strconcat(path, G_DIR_SEPARATOR_S, GROUPLIST_FILE, NULL);
- g_free(path);
- if (remove(filename) != 0)
- log_warning(_("can't delete cached group list %s\n"), filename);
- g_free(filename);
-}
-
-\f
-/* NNTP Authentication support (RFC2980). */
-
-
-/**
- * news_query_password:
- * @session: Active NNTP session.
- * @user: User name.
- *
- * Ask user for the NNTP authentication password.
- *
- * Return value: Password string; needs to be freed with g_free()
- * after use.
- **/
-static gchar *news_query_password(NNTPSession *session,
- const gchar *user)
-{
- gchar *message;
- gchar *pass;
-
- message = g_strdup_printf
- (_("Input password for %s on %s:"),
- user,
- SESSION(session)->server);
-
- pass = input_dialog_with_invisible(_("Input password"),
- message, NULL);
- g_free(message);
-/* manage_window_focus_in(inc_dialog->mainwin->window, */
-/* NULL, NULL); */
- return pass;
-}
-
-/**
- * news_authenticate:
- * @folder: NNTP folder.
- *
- * Send NNTP authentication information (AUTHINFO USER, AUTHINFO PASS)
- * as described in RFC2980. May ask user for the password if it is
- * not stored in account settings.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_authenticate(Folder *folder)
-{
- NNTPSession *session;
- gint ok;
- const gchar *user;
- gchar *pass;
- gboolean need_free_pass = FALSE;
-
- debug_print(_("news server requested authentication\n"));
- if (!folder || !folder->account)
- return NN_ERROR;
- user = folder->account->userid;
- if (!user)
- return NN_ERROR;
- session = NNTP_SESSION(REMOTE_FOLDER(folder)->session);
- if (!session)
- return NN_ERROR;
- ok = nntp_authinfo_user(SESSION(session)->sock, user);
- if (ok == NN_AUTHCONT) {
- pass = folder->account->passwd;
- if (!pass || !pass[0]) {
- pass = news_query_password(session, user);
- need_free_pass = TRUE;
- }
- ok = nntp_authinfo_pass(SESSION(session)->sock, pass);
- if (need_free_pass)
- g_free(pass);
- }
- if (ok != NN_SUCCESS) {
- log_warning(_("NNTP authentication failed\n"));
- alertpanel_error(_("Authentication for %s on %s failed."),
- user, SESSION(session)->server);
- }
- return ok;
-}
-
-
-/**
- * news_nntp_group:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- * @group: Group name to select.
- * @num: Pointer to returned number of messages in the group.
- * @first: Pointer to returned number of first message.
- * @last: Pointer to returned number of last message.
- *
- * Wrapper for nntp_group() to do authentication if requested.
- * Selects newsgroup @group and returns information from the server
- * response in @num, @first, @last (which cannot be NULL).
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_group(Folder *folder, SockInfo *sock,
- const gchar *group,
- gint *num, gint *first, gint *last)
-{
- gint ok;
-
- if ((ok = nntp_group(sock, group, num, first, last)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_group(sock, group, num, first, last);
- }
- return ok;
-}
-
-/**
- * news_nntp_list:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- *
- * Wrapper for nntp_list() to do authentication if requested. Sends
- * the LIST command to @sock and receives the status code line.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_list(Folder *folder, SockInfo *sock)
-{
- gint ok;
-
- if ((ok = nntp_list(sock)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_list(sock);
- }
- return ok;
-}
-
-/**
- * news_nntp_xover:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- * @first: First message number.
- * @last: Last message number.
- *
- * Wrapper for nntp_xover() to do authentication if requested. Sends
- * the XOVER command with parameters @first and @last to @sock and
- * receives the status code line.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_xover(Folder *folder, SockInfo *sock,
- gint first, gint last)
-{
- gint ok;
-
- if ((ok = nntp_xover(sock, first, last)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_xover(sock, first, last);
- }
- return ok;
-}
-
-/**
- * news_nntp_post:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- * @fp: File with the message (header and body), opened for reading.
- *
- * Wrapper for nntp_post() to do authentication if requested. Sends
- * the POST command to @sock, and if the server accepts it, sends the
- * message from @fp.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_post(Folder *folder, SockInfo *sock, FILE *fp)
-{
- gint ok;
-
- if ((ok = nntp_post(sock, fp)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_post(sock, fp);
- }
- return ok;
-}
-
-/**
- * news_nntp_mode:
- * @folder: NNTP folder.
- * @sock: NNTP socket.
- * @stream: TRUE for stream mode, FALSE for reader mode.
- *
- * Wrapper for nntp_mode() to do authentication if requested. Sends
- * the "MODE READER" or "MODE STREAM" command to @sock, depending on
- * @stream, and receives the status responce.
- *
- * Return value: NNTP result code (NN_*).
- **/
-static gint news_nntp_mode(Folder *folder, SockInfo *sock, gboolean stream)
-{
- gint ok;
-
- if ((ok = nntp_mode(sock, stream)) == NN_AUTHREQ) {
- ok = news_authenticate(folder);
- if (ok != NN_SUCCESS)
- return ok;
- ok = nntp_mode(sock, stream);
- }
- return ok;
-}
projects / claws.git / blobdiff