summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2013-05-24 20:26:58 +0000
committerRobert Pösel <robyer@seznam.cz>2013-05-24 20:26:58 +0000
commit43ecfa15193150d7fde82247680f7e16a5f1b8fa (patch)
tree50a3be4b20fc824a4308da7b3923d3366ff2db84
parent386b0374969f724a99d145242dddf8562ff1be7c (diff)
PluginUpdater: do not update unchecked files from archives of checked files. version bump.
git-svn-id: http://svn.miranda-ng.org/main/trunk@4814 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/PluginUpdater/src/Common.h1
-rw-r--r--plugins/PluginUpdater/src/Version.h2
-rw-r--r--plugins/PluginUpdater/src/unzipfile.cpp6
3 files changed, 8 insertions, 1 deletions
diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h
index 5011421482..e843f07125 100644
--- a/plugins/PluginUpdater/src/Common.h
+++ b/plugins/PluginUpdater/src/Common.h
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.
#include <windows.h>
#include <Windowsx.h>
#include <Shlobj.h>
+#include <string.h>
// Miranda header files
#include <newpluginapi.h>
diff --git a/plugins/PluginUpdater/src/Version.h b/plugins/PluginUpdater/src/Version.h
index f4b3da3a15..ac65bec1ec 100644
--- a/plugins/PluginUpdater/src/Version.h
+++ b/plugins/PluginUpdater/src/Version.h
@@ -1,7 +1,7 @@
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 1
#define __RELEASE_NUM 1
-#define __BUILD_NUM 0
+#define __BUILD_NUM 1
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
diff --git a/plugins/PluginUpdater/src/unzipfile.cpp b/plugins/PluginUpdater/src/unzipfile.cpp
index 2362debf44..a20fad318f 100644
--- a/plugins/PluginUpdater/src/unzipfile.cpp
+++ b/plugins/PluginUpdater/src/unzipfile.cpp
@@ -55,6 +55,12 @@ bool extractCurrentFile(unzFile uf, TCHAR *ptszDestPath, TCHAR *ptszBackPath)
if (!opts.bUpdateIcons && !_strnicmp(filename, "Icons/", 6))
return true;
+ for (char *p = strchr(filename, '/'); p; p = strchr(p+1, '/'))
+ *p = '\\';
+
+ if (!db_get_b(NULL, MODNAME "Files", filename, true))
+ return true;
+
TCHAR tszDestFile[MAX_PATH], tszBackFile[MAX_PATH];
TCHAR *ptszNewName = mir_utf8decodeT(filename);
if (ptszNewName == NULL)