巨大な書庫でファイルが二重に表示されていたバグを修正。

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

diff --git a/src/plugin/cuiWrapper/cuiWrapper.cpp b/src/plugin/cuiWrapper/cuiWrapper.cpp
index 43f8241..8a52f64 100644 (file)
--- a/src/plugin/cuiWrapper/cuiWrapper.cpp
+++ b/src/plugin/cuiWrapper/cuiWrapper.cpp
@@ -84,9 +84,9 @@ DWORD myExecute(wxString szCommandLine, wxString * szOutput, wxString szCwd, boo
        if (szOutput != NULL)\r
        {\r
                char sz[32769];\r
-               memset(sz, 0, sizeof(sz));\r
                while (! feof(fp))\r
                {\r
+                       memset(sz, 0, sizeof(sz));\r
                        fread(sz, sizeof(char), sizeof(sz) - 1, fp);\r
                        * szOutput += UTF82String(sz);\r
                }\r
@@ -134,9 +134,9 @@ DWORD myExecute(wxString szCommandLine, wxString * szOutput, wxString szCwd, boo
        {\r
                DWORD dwSize = 0;\r
                char sz[32769];\r
-               memset(sz, 0, sizeof(sz));\r
                for (wxULongLong llSize = 0; llSize < ::GetFileSize(hRead, NULL); llSize += dwSize)\r
                {\r
+                       memset(sz, 0, sizeof(sz));\r
                        dwSize = 0;\r
                        ::ReadFile(hRead, sz, sizeof(sz) - 1, & dwSize, NULL);\r
                        * szOutput += UTF82String(sz);\r
@@ -360,6 +360,7 @@ int __stdcall OpenArchive
                }\r
                g_szCurrentArchive = _szArcName;\r
                g_asOutput = ::wxStringTokenize(szOutput, wxT("\r\n"));\r
+               g_asOutput.Shrink();\r
        }\r
        if (_hArchive != NULL)\r
        {\r