Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=6679
This commit is contained in:
David Anderson 2005-07-19 18:34:42 +00:00
parent 3eeb71f8de
commit 67359ed0e7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checkin_notes
View File

@ -9265,3 +9265,9 @@ Charlie 19 July 2005
mac_build/ mac_build/
boinc.pbproj/ boinc.pbproj/
project.pbxproj project.pbxproj
David 19 2005
- bug fix in zip code (from Carl C.)
zip/
boinc_zip.cpp

7
zip/boinc_zip.cpp
View File

@ -195,7 +195,6 @@ bool boinc_filelist(const std::string directory,
std::string strFile; std::string strFile;
// at most three |'s may be passed in pattern match // at most three |'s may be passed in pattern match
int iPos[3], iFnd, iCtr, i, lastPos; int iPos[3], iFnd, iCtr, i, lastPos;
struct stat statF;
std::string strFullPath; std::string strFullPath;
char strPart[3][32]; char strPart[3][32];
std::string spattern = pattern; std::string spattern = pattern;
@ -227,9 +226,9 @@ bool boinc_filelist(const std::string directory,
// transform strDir to either all \\ or all / // transform strDir to either all \\ or all /
int j; int j;
for (j=0; j<directory.size(); j++) { for (j=0; j<(int)directory.size(); j++) {
// take off final / or backslash // take off final / or backslash
if (j == (directory.size()-1) if (j == ((int)directory.size()-1)
&& (strDir[j] == '/' || strDir[j]=='\\')) && (strDir[j] == '/' || strDir[j]=='\\'))
strDir.resize(directory.size()-1); strDir.resize(directory.size()-1);
else { else {
@ -299,7 +298,7 @@ bool boinc_filelist(const std::string directory,
strFullPath = strUserDir + strFile; strFullPath = strUserDir + strFile;
// only add if the file really exists (i.e. not a directory) // only add if the file really exists (i.e. not a directory)
if (is_file(strFullPath.c_str())) { if (is_file(strFullPath.c_str())) {
ZipFileEntry zfe(strFullPath, statF, ucSort); ZipFileEntry zfe(strFullPath, ucSort);
pList->push_back(zfe); pList->push_back(zfe);
} }
} }