[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=f93877f

The following commit has been merged in the master branch:
commit f93877f94bd19dd2fbde104532c0b57d982ea036
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Sep 1 17:57:58 2014 +0000

    Issue: #984. Thank You, Axel for reporting this,  the patch, and the test code.
---
 msvc2005/tools/issue984/main.c | 23 +++++++++++++++++++++++
 src/basicio.cpp                | 22 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/msvc2005/tools/issue984/main.c b/msvc2005/tools/issue984/main.c
new file mode 100644
index 0000000..ae30eb7
--- /dev/null
+++ b/msvc2005/tools/issue984/main.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <windows.h>
+
+int main(int argc, char** argv)
+{
+	printf("Opening file '%s' with FILE_SHARE_DELETE acess...
", argv[1]);
+
+	HANDLE hFile = CreateFile(argv[1], GENERIC_READ,
+			FILE_SHARE_DELETE|FILE_SHARE_READ|FILE_SHARE_WRITE,
+			NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,	NULL);
+
+	if (hFile == INVALID_HANDLE_VALUE) {
+		printf("failed to open file
");
+		return -1;
+	}
+
+	sleep(10);
+
+	CloseHandle(hFile);
+
+	return 0;
+}
+
diff --git a/src/basicio.cpp b/src/basicio.cpp
index d95940a..4f46cd9 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -710,6 +710,16 @@ namespace Exiv2 {
             // MSVCRT rename that does not overwrite existing files
 #ifdef EXV_UNICODE_PATH
             if (p_->wpMode_ == Impl::wpUnicode) {
+#if defined WIN32 && !defined __CYGWIN__
+                // Windows implementation that deals with the fact that ::rename fails
+                // if the target filename still exists, which regularly happens when
+                // that file has been opened with FILE_SHARE_DELETE by another process,
+                // like a virus scanner or disk indexer
+                // (see also http://stackoverflow.com/a/11023068)
+                if (ReplaceFileW(wpf, fileIo->wpath().c_str(), NULL, REPLACEFILE_IGNORE_MERGE_ERRORS, NULL, NULL) == 0) {
+                    throw WError(17, fileIo->wpath(), wpf, strError().c_str());
+                }
+#else
                 if (fileExists(wpf) && ::_wremove(wpf) != 0) {
                     throw WError(2, wpf, strError().c_str(), "::_wremove");
                 }
@@ -717,6 +727,7 @@ namespace Exiv2 {
                     throw WError(17, fileIo->wpath(), wpf, strError().c_str());
                 }
                 ::_wremove(fileIo->wpath().c_str());
+#endif
                 // Check permissions of new file
                 struct _stat buf2;
                 if (statOk && ::_wstat(wpf, &buf2) == -1) {
@@ -737,6 +748,16 @@ namespace Exiv2 {
             else
 #endif // EXV_UNICODE_PATH
             {
+#if defined WIN32 && !defined __CYGWIN__
+                // Windows implementation that deals with the fact that ::rename fails
+                // if the target filename still exists, which regularly happens when
+                // that file has been opened with FILE_SHARE_DELETE by another process,
+                // like a virus scanner or disk indexer
+                // (see also http://stackoverflow.com/a/11023068)
+                if (ReplaceFile(pf, fileIo->path().c_str(), NULL, REPLACEFILE_IGNORE_MERGE_ERRORS, NULL, NULL) == 0) {
+                    throw Error(17, fileIo->path(), pf, strError());
+                }
+#else
                 if (fileExists(pf) && ::remove(pf) != 0) {
                     throw Error(2, pf, strError(), "::remove");
                 }
@@ -744,6 +765,7 @@ namespace Exiv2 {
                     throw Error(17, fileIo->path(), pf, strError());
                 }
                 ::remove(fileIo->path().c_str());
+#endif
                 // Check permissions of new file
                 struct stat buf2;
                 if (statOk && ::stat(pf, &buf2) == -1) {

-- 
exiv2 packaging