From 3ad4efad565998dda3a31d9d4d2a4dceda980aac Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Mon, 16 Mar 2009 02:54:54 +0000
Subject: unix: fixed infinite loop bug.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2120 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog        | 6 ++++++
 ChangeLog.ja     | 5 +++++
 libsylph/mh.c    | 2 +-
 libsylph/utils.c | 4 +++-
 libsylph/utils.h | 4 ++--
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4280c0ea..bbfb70d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-16
+
+	* libsylph/utils.[ch]
+	  libsylph/mh.c: g_link(): fixed infinite loop bug on Unix and
+	  renamed g_link to syl_link.
+
 2008-03-13
 
 	* libsylph/utils.[ch]
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 2c1cd500..aed72dd0 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2008-03-16
+	* libsylph/utils.[ch]
+	  libsylph/mh.c: g_link(): Unix で無限ループに陥るバグを修正。
+	  g_link を syl_link に名称変更。
+
 2008-03-13
 
 	* libsylph/utils.[ch]
diff --git a/libsylph/mh.c b/libsylph/mh.c
index 4b68cd3a..abbfc23d 100644
--- a/libsylph/mh.c
+++ b/libsylph/mh.c
@@ -459,7 +459,7 @@ static gint mh_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
 		if (first_ == 0 || first_ > dest->last_num + 1)
 			first_ = dest->last_num + 1;
 
-		if (g_link(fileinfo->file, destfile) < 0) {
+		if (syl_link(fileinfo->file, destfile) < 0) {
 			if (copy_file(fileinfo->file, destfile, TRUE) < 0) {
 				g_warning(_("can't copy message %s to %s\n"),
 					  fileinfo->file, destfile);
diff --git a/libsylph/utils.c b/libsylph/utils.c
index 208458ea..d67ff14d 100644
--- a/libsylph/utils.c
+++ b/libsylph/utils.c
@@ -152,7 +152,8 @@ gint g_chmod(const gchar *path, gint mode)
 }
 #endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
 
-gint g_link(const gchar *src, const gchar *dest)
+#ifndef G_OS_UNIX
+gint syl_link(const gchar *src, const gchar *dest)
 {
 #ifdef G_OS_WIN32
 	wchar_t *wsrc;
@@ -208,6 +209,7 @@ gint g_link(const gchar *src, const gchar *dest)
 	return link(src, dest);
 #endif
 }
+#endif /* !G_OS_UNIX */
 
 void list_free_strings(GList *list)
 {
diff --git a/libsylph/utils.h b/libsylph/utils.h
index 6788c3d6..97221fb9 100644
--- a/libsylph/utils.h
+++ b/libsylph/utils.h
@@ -68,9 +68,9 @@ gint g_chmod	(const gchar	*path,
 #endif /* !GLIB_CHECK_VERSION */
 
 #ifdef G_OS_UNIX
-#define g_link		link
+#define syl_link	link
 #else
-gint g_link	(const gchar	*src,
+gint syl_link	(const gchar	*src,
 		 const gchar	*dest);
 #endif
 
-- 
cgit v1.2.3