removed the restriction that the template body over 8KB could not be read.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2007 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 15 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 145e424d..6fdba887 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-06-06
 
+	* src/template.c: template_load(): removed the restriction that the
+	  template body over 8KB could not be read.
+
+2008-06-06
+
 	* INSTALL
 	  INSTALL.ja: fixed GnuPG/GPGME URL.
 	* configure.in: require GPGME >= 1.0.0.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 5d77bfa4..fb687382 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2008-06-06
 
+	* src/template.c: template_load(): 8KB を超えるテンプレート本文を
+	  読めない制限をなくした。
+
+2008-06-06
+
 	* INSTALL
 	  INSTALL.ja: GnuPG/GPGME の URL を修正。
 	* configure.in: GPGME >= 1.0.0 を要求するようにした。
diff --git a/src/template.c b/src/template.c
index 1ade3d6f..074c6080 100644
--- a/src/template.c
+++ b/src/template.c
@@ -37,7 +37,6 @@ static Template *template_load(gchar *filename)
 	Template *tmpl;
 	FILE *fp;
 	gchar buf[BUFFSIZE];
-	gint bytes_read;
 
 	if ((fp = g_fopen(filename, "rb")) == NULL) {
 		FILE_OP_ERROR(filename, "fopen");
@@ -76,15 +75,13 @@ static Template *template_load(gchar *filename)
 		return NULL;
 	}
 
-	if ((bytes_read = fread(buf, 1, sizeof(buf), fp)) == 0) {
-		if (ferror(fp)) {
-			FILE_OP_ERROR(filename, "fread");
-			template_free(tmpl);
-			return NULL;
-		}
+	tmpl->value = file_read_stream_to_str(fp);
+	if (!tmpl->value) {
+		g_warning("cannot read template body\n");
+		template_free(tmpl);
+		return NULL;
 	}
 	fclose(fp);
-	tmpl->value = g_strndup(buf, bytes_read);
 
 	return tmpl;
 }