diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.ja | 7 | ||||
| -rw-r--r-- | libsylph/mbox.c | 4 | ||||
| -rw-r--r-- | libsylph/smtp.c | 14 | ||||
| -rw-r--r-- | libsylph/smtp.h | 4 | ||||
| -rw-r--r-- | src/inc.c | 6 |
6 files changed, 26 insertions, 16 deletions
@@ -1,5 +1,12 @@ 2008-12-11 + * libsylph/mbox.c + libsylph/smtp.[ch] + src/inc.c: renamed/removed MSGBUFSIZE since it conflicts with + OpenBSD's header file. + +2008-12-11 + * libsylph/procmime.c: procmime_parse_mime_parameter(): made a workaround for raw-JIS filename (Eudora etc.). diff --git a/ChangeLog.ja b/ChangeLog.ja index 3d3592fe..d19b015b 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,12 @@ 2008-12-11 + * libsylph/mbox.c + libsylph/smtp.[ch] + src/inc.c: MSGBUFSIZE を改名または削除(OpenBSD のヘッダファイルと + 衝突するため)。 + +2008-12-11 + * libsylph/procmime.c: procmime_parse_mime_parameter(): 生 JIS ファイル名への対策を行った(Eudora 等)。 diff --git a/libsylph/mbox.c b/libsylph/mbox.c index 17511697..34aad016 100644 --- a/libsylph/mbox.c +++ b/libsylph/mbox.c @@ -42,8 +42,6 @@ #include "account.h" #include "utils.h" -#define MSGBUFSIZE 8192 - #define FPUTS_TO_TMP_ABORT_IF_FAIL(s) \ { \ if (fputs(s, tmp_fp) == EOF) { \ @@ -69,7 +67,7 @@ gint proc_mbox_full(FolderItem *dest, const gchar *mbox, gboolean filter_junk) { FILE *mbox_fp; - gchar buf[MSGBUFSIZE], from_line[MSGBUFSIZE]; + gchar buf[BUFFSIZE], from_line[BUFFSIZE]; gchar *tmp_file; gint msgs = 0; diff --git a/libsylph/smtp.c b/libsylph/smtp.c index 2ee725ee..da41a97a 100644 --- a/libsylph/smtp.c +++ b/libsylph/smtp.c @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -117,7 +117,7 @@ static void smtp_session_destroy(Session *session) static gint smtp_from(SMTPSession *session) { - gchar buf[MSGBUFSIZE]; + gchar buf[SMTPBUFSIZE]; g_return_val_if_fail(session->from != NULL, SM_ERROR); @@ -163,7 +163,7 @@ static gint smtp_auth(SMTPSession *session) static gint smtp_auth_recv(SMTPSession *session, const gchar *msg) { - gchar buf[MSGBUFSIZE]; + gchar buf[SMTPBUFSIZE]; switch (session->auth_type) { case SMTPAUTH_LOGIN: @@ -236,7 +236,7 @@ static gint smtp_auth_recv(SMTPSession *session, const gchar *msg) static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar *msg) { - gchar buf[MSGBUFSIZE]; + gchar buf[SMTPBUFSIZE]; session->state = SMTP_AUTH_LOGIN_PASS; @@ -255,7 +255,7 @@ static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar *msg) static gint smtp_ehlo(SMTPSession *session) { - gchar buf[MSGBUFSIZE]; + gchar buf[SMTPBUFSIZE]; session->state = SMTP_EHLO; @@ -370,7 +370,7 @@ static gint smtp_auth_login(SMTPSession *session) static gint smtp_helo(SMTPSession *session) { - gchar buf[MSGBUFSIZE]; + gchar buf[SMTPBUFSIZE]; session->state = SMTP_HELO; @@ -384,7 +384,7 @@ static gint smtp_helo(SMTPSession *session) static gint smtp_rcpt(SMTPSession *session) { - gchar buf[MSGBUFSIZE]; + gchar buf[SMTPBUFSIZE]; gchar *to; g_return_val_if_fail(session->cur_to != NULL, SM_ERROR); diff --git a/libsylph/smtp.h b/libsylph/smtp.h index 6a087773..6bf3ce55 100644 --- a/libsylph/smtp.h +++ b/libsylph/smtp.h @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,7 +33,7 @@ typedef struct _SMTPSession SMTPSession; #define SMTP_SESSION(obj) ((SMTPSession *)obj) -#define MSGBUFSIZE 8192 +#define SMTPBUFSIZE 8192 typedef enum { @@ -68,8 +68,6 @@ static GdkPixbuf *current_pixbuf; static GdkPixbuf *error_pixbuf; static GdkPixbuf *ok_pixbuf; -#define MSGBUFSIZE 8192 - static void inc_finished (MainWindow *mainwin, gint new_messages); @@ -958,7 +956,7 @@ static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog, #if 0 if (session->msg[session->cur_msg].recv_time < session->current_time) { - gchar buf[MSGBUFSIZE]; + gchar buf[BUFFSIZE]; g_snprintf(buf, sizeof(buf), _("Deleting message %d"), session->cur_msg); progress_dialog_set_label(dialog, buf); @@ -976,7 +974,7 @@ static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog, static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog, IncSession *inc_session) { - gchar buf[MSGBUFSIZE]; + gchar buf[BUFFSIZE]; Pop3Session *pop3_session = POP3_SESSION(inc_session->session); gchar *total_size_str; gint64 cur_total; |