git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@417 9df91469-1e22-0410-86e7...

diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index ff7021b..d006789 100644 (file)
--- a/src/plugin/7zArc/7zArc.cpp
+++ b/src/plugin/7zArc/7zArc.cpp
@@ -70,7 +70,7 @@ int GetFileInformation2(void * _hArchive, TPI_FILEINFO * _fiInfo, wxULongLong_t
                _fiInfo->dwAttribute |= TPI_ATTRIBUTE_DIRECTORY;\r
        }\r
        hArc->GetProperty(nIndex, kpidPosixAttrib, & prop);\r
-       _fiInfo->wPermission    = prop.vt == VT_EMPTY ? 0644 : prop.uintVal;\r
+       _fiInfo->wPermission    = prop.vt == VT_EMPTY ? 0664 : prop.uintVal;\r
        hArc->GetProperty(nIndex, kpidEncrypted, & prop);\r
        if (prop.vt == VT_BOOL && VARIANT_BOOLToBool(prop.boolVal))\r
        {\r
@@ -526,9 +526,10 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(int nResult)
        // 属性を記録。\r
        if (this->nMode == NArchive::NExtract::NAskMode::kExtract)\r
        {\r
+#ifdef __WINDOWS__\r
                NWindows::NFile::NDirectory::MySetFileAttributes(this->piInfo.fnDestination.GetFullPath(), this->piInfo.fiInfo.dwAttribute);\r
-#ifdef __LINUX__\r
-               _wchmod(this->piInfo.fnDestination.GetFullPath().c_str());\r
+#else\r
+               chmod(this->piInfo.fnDestination.GetFullPath().ToUTF8(), this->piInfo.fiInfo.wPermission);\r
 #endif\r
        }\r
 \r

diff --git a/src/plugin/7zArc/Makefile b/src/plugin/7zArc/Makefile
index bdd85ae..f9bc917 100644 (file)
--- a/src/plugin/7zArc/Makefile
+++ b/src/plugin/7zArc/Makefile
@@ -4,5 +4,5 @@ PLUGIN_NAME = 7zArc
 7ZBASE      = 7-zip_linux\r
 CPPFLAGS_ADD= -I$(7ZBASE)/CPP -I$(7ZBASE)/CPP/myWindows -I$(7ZBASE)/CPP/include_windows -I$(7ZBASE)/CPP/7zip/UI/Client7z -DUSE_WIN_FILE\r
 7ZDIR       = ../../plugin/7zArc/$(7ZBASE)/CPP\r
-OBJS_ADD    = $(7ZDIR)/7zip/Common/FileStreams.o $(7ZDIR)/Common/MyString.o $(7ZDIR)/Common/MyVector.o $(7ZDIR)/Common/MyWindows.o $(7ZDIR)/Common/StringConvert.o $(7ZDIR)/myWindows/wine_date_and_time.o $(7ZDIR)/Windows/FileDir.o $(7ZDIR)/Windows/FileFind.o $(7ZDIR)/Windows/FileIO.o $(7ZDIR)/Windows/PropVariant.o $(7ZDIR)/Windows/Time.o\r
+OBJS_ADD    = $(7ZDIR)/7zip/Common/FileStreams.o $(7ZDIR)/Common/MyString.o $(7ZDIR)/Common/MyVector.o $(7ZDIR)/Common/MyWindows.o $(7ZDIR)/Common/StringConvert.o $(7ZDIR)/myWindows/wine_date_and_time.o $(7ZDIR)/Windows/FileFind.o $(7ZDIR)/Windows/FileIO.o $(7ZDIR)/Windows/PropVariant.o $(7ZDIR)/Windows/Time.o\r
 include ../Makefile.default\r