Changeset 3738

Timestamp:

08/19/08 11:26:36

Author:

vivek

Message:

reverted to revision 3730, for use with week 34 release.

Files:

• releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/providers/local/camel-local-store.c (modified) (2 diffs)

releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/providers/local/camel-local-store.c

@@ -348 +348 @@
-                        ret = -1;
-                }
+#ifndef G_OS_WIN32
+        } else if (S_ISDIR(st.st_mode)) { /* use rename for dirs */
+                if (rename(old, new) == 0
+                    || stat(new, &st) == 0) {
+                        ret = 0;
+                } else {
+                        err = errno;
+                        ret = -1;
+                }
+        } else if (link(old, new) == 0 /* and link for files */
+                   || (stat(new, &st) == 0 && st.st_nlink == 2)) {
+                if (unlink(old) == 0) {
+                        ret = 0;
+                } else {
+                        err = errno;
+                        unlink(new);
+                        ret = -1;
+                }
+        } else {
+                err = errno;
+                ret = -1;
+#else
-        } else if ((!g_file_test (new, G_FILE_TEST_EXISTS) || g_remove (new) == 0) &&
-                   g_rename(old, new) == 0) {
@@ -354 +376 @@
-                err = errno;
-                ret = -1;
+#endif
-        }
-