* src/inc.c
* src/mbox.c
* src/common/smtp.c
* src/common/smtp.h
Fix bug #2639, "The MSGBUFSIZE definition collides with a definition of OpenBSD"
Patch by "madroach"
+2012-10-10 [colin] 3.8.1cvs90
+
+ * src/inc.c
+ * src/mbox.c
+ * src/common/smtp.c
+ * src/common/smtp.h
+ Fix bug #2639, "The MSGBUFSIZE definition collides with a definition of OpenBSD"
+ Patch by "madroach"
+
2012-10-10 [colin] 3.8.1cvs89
* autogen.sh
2012-10-10 [colin] 3.8.1cvs89
* autogen.sh
( cvs diff -u -r 1.36.2.202 -r 1.36.2.203 src/common/utils.c; ) > 3.8.1cvs87.patchset
( cvs diff -u -r 1.382.2.614 -r 1.382.2.615 src/compose.c; ) > 3.8.1cvs88.patchset
( cvs diff -u -r 1.4.2.10 -r 1.4.2.11 autogen.sh; ) > 3.8.1cvs89.patchset
( cvs diff -u -r 1.36.2.202 -r 1.36.2.203 src/common/utils.c; ) > 3.8.1cvs87.patchset
( cvs diff -u -r 1.382.2.614 -r 1.382.2.615 src/compose.c; ) > 3.8.1cvs88.patchset
( cvs diff -u -r 1.4.2.10 -r 1.4.2.11 autogen.sh; ) > 3.8.1cvs89.patchset
+( cvs diff -u -r 1.149.2.111 -r 1.149.2.112 src/inc.c; cvs diff -u -r 1.28.2.53 -r 1.28.2.54 src/mbox.c; cvs diff -u -r 1.11.2.32 -r 1.11.2.33 src/common/smtp.c; cvs diff -u -r 1.6.2.21 -r 1.6.2.22 src/common/smtp.h; ) > 3.8.1cvs90.patchset
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
gint smtp_from(SMTPSession *session)
{
gint smtp_from(SMTPSession *session)
{
+ gchar buf[MESSAGEBUFSIZE];
gchar *mail_size = NULL;
cm_return_val_if_fail(session->from != NULL, SM_ERROR);
gchar *mail_size = NULL;
cm_return_val_if_fail(session->from != NULL, SM_ERROR);
static gint smtp_auth_recv(SMTPSession *session, const gchar *msg)
{
static gint smtp_auth_recv(SMTPSession *session, const gchar *msg)
{
+ gchar buf[MESSAGEBUFSIZE];
switch (session->auth_type) {
case SMTPAUTH_LOGIN:
switch (session->auth_type) {
case SMTPAUTH_LOGIN:
static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar *msg)
{
static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar *msg)
{
+ gchar buf[MESSAGEBUFSIZE];
session->state = SMTP_AUTH_LOGIN_PASS;
session->state = SMTP_AUTH_LOGIN_PASS;
static gint smtp_ehlo(SMTPSession *session)
{
static gint smtp_ehlo(SMTPSession *session)
{
+ gchar buf[MESSAGEBUFSIZE];
session->state = SMTP_EHLO;
session->state = SMTP_EHLO;
static gint smtp_auth_plain(SMTPSession *session)
{
static gint smtp_auth_plain(SMTPSession *session)
{
+ gchar buf[MESSAGEBUFSIZE];
static gint smtp_helo(SMTPSession *session)
{
static gint smtp_helo(SMTPSession *session)
{
+ gchar buf[MESSAGEBUFSIZE];
session->state = SMTP_HELO;
session->state = SMTP_HELO;
static gint smtp_rcpt(SMTPSession *session)
{
static gint smtp_rcpt(SMTPSession *session)
{
+ gchar buf[MESSAGEBUFSIZE];
gchar *to;
cm_return_val_if_fail(session->cur_to != NULL, SM_ERROR);
gchar *to;
cm_return_val_if_fail(session->cur_to != NULL, SM_ERROR);
#define SMTP_SESSION(obj) ((SMTPSession *)obj)
#define SMTP_SESSION(obj) ((SMTPSession *)obj)
+#define MESSAGEBUFSIZE 8192
static GdkPixbuf *errorpix;
static GdkPixbuf *okpix;
static GdkPixbuf *errorpix;
static GdkPixbuf *okpix;
+#define MESSAGEBUFSIZE 8192
static void inc_update_stats(gint new_msgs);
static void inc_finished (MainWindow *mainwin,
static void inc_update_stats(gint new_msgs);
static void inc_finished (MainWindow *mainwin,
static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
IncSession *inc_session)
{
static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
IncSession *inc_session)
{
+ gchar buf[MESSAGEBUFSIZE];
Pop3Session *pop3_session = POP3_SESSION(inc_session->session);
gchar *total_size_str;
gint cur_total;
Pop3Session *pop3_session = POP3_SESSION(inc_session->session);
gchar *total_size_str;
gint cur_total;
#include "alertpanel.h"
#include "statusbar.h"
#include "alertpanel.h"
#include "statusbar.h"
+#define MESSAGEBUFSIZE 8192
#ifdef HAVE_FGETS_UNLOCKED
#define SC_FGETS fgets_unlocked
#ifdef HAVE_FGETS_UNLOCKED
#define SC_FGETS fgets_unlocked
/* return values: -1 error, >=0 number of msgs added */
{
FILE *mbox_fp;
/* return values: -1 error, >=0 number of msgs added */
{
FILE *mbox_fp;
+ gchar buf[MESSAGEBUFSIZE];
gchar *tmp_file;
gint msgs = 0;
gint lines;
gchar *tmp_file;
gint msgs = 0;
gint lines;