From ce4a512127c7f7651421625968a9d5b1d2833c1c Mon Sep 17 00:00:00 2001 From: Hiroyuki Yamamoto Date: Mon, 30 Apr 2001 23:49:35 +0000 Subject: [PATCH 1/1] changed sock_read() in some files to sock_gets(). --- ChangeLog.claws | 8 +++++++- src/esmtp.c | 2 +- src/news.c | 2 +- src/nntp.c | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index 745efd508..947215d59 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,10 @@ +2001-05-01 [hiroyuki] + + * src/esmtp.c + src/news.c + src/nntp.c: changed sock_read() to sock_gets(), they've been left + unsynched. + 2001-05-01 [hoa] * src/Makefile.am added prefs_display_headers.[ch] headers_display.[ch] * src/defs.h added HEADERS_DISPLAY_RC : name of the config file @@ -37,7 +44,6 @@ * src/news.c (news_session_new_for_folder): set userid=NULL if password dialog is cancelled. ->>>>>>> 1.29 2001-04-30 [sergey] * src/nntp.h (NNTPSockInfo): new type. diff --git a/src/esmtp.c b/src/esmtp.c index 222d6b251..b77b2f927 100644 --- a/src/esmtp.c +++ b/src/esmtp.c @@ -140,7 +140,7 @@ gint esmtp_auth(SockInfo *sock, SMTPAuthType authtype, gint esmtp_ok(SockInfo *sock) { - while (sock_read(sock, esmtp_response, sizeof(esmtp_response) - 1) + while (sock_gets(sock, esmtp_response, sizeof(esmtp_response) - 1) != -1) { if (strlen(esmtp_response) < 4) return SM_ERROR; diff --git a/src/news.c b/src/news.c index c76781e27..27a500221 100644 --- a/src/news.c +++ b/src/news.c @@ -376,7 +376,7 @@ static GSList *news_get_uncached_articles(NNTPSession *session, } 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; } diff --git a/src/nntp.c b/src/nntp.c index 1bf593197..0fa9332a1 100644 --- a/src/nntp.c +++ b/src/nntp.c @@ -289,7 +289,7 @@ static void nntp_gen_send(NNTPSockInfo *sock, const gchar *format, ...) static gint nntp_gen_recv(NNTPSockInfo *sock, gchar *buf, gint size) { - if (sock_read(sock->sock, buf, size) == -1) + if (sock_gets(sock->sock, buf, size) == -1) return NN_SOCKET; strretchomp(buf); -- 2.25.1