diff options
author | Marc Laukien <marc@zeroc.com> | 2004-11-23 22:12:24 +0000 |
---|---|---|
committer | Marc Laukien <marc@zeroc.com> | 2004-11-23 22:12:24 +0000 |
commit | 91deee21295bb4a4e22b710dedad44e747d47272 (patch) | |
tree | 2c5a9c9f3d748eb523b5f515d03d696bc9e0b2fc /cpp/src/IcePatch2/Util.cpp | |
parent | more IcePatch2 (diff) | |
download | ice-91deee21295bb4a4e22b710dedad44e747d47272.tar.bz2 ice-91deee21295bb4a4e22b710dedad44e747d47272.tar.xz ice-91deee21295bb4a4e22b710dedad44e747d47272.zip |
more IcePatch2
Diffstat (limited to 'cpp/src/IcePatch2/Util.cpp')
-rw-r--r-- | cpp/src/IcePatch2/Util.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp index 92abb5b039d..027ded3b540 100644 --- a/cpp/src/IcePatch2/Util.cpp +++ b/cpp/src/IcePatch2/Util.cpp @@ -524,7 +524,7 @@ IcePatch2::uncompressFile(const string& pa) } void -IcePatch2::getFileInfoSeq(const string& pa, FileInfoSeq& infoSeq, bool compress, bool verbose) +IcePatch2::getFileInfoSeq(const string& pa, FileInfoSeq& infoSeq, bool size, bool compress, bool verbose) { const string path = normalize(pa); @@ -598,7 +598,7 @@ IcePatch2::getFileInfoSeq(const string& pa, FileInfoSeq& infoSeq, bool compress, StringSeq content = readDirectory(path); for(StringSeq::const_iterator p = content.begin(); p != content.end() ; ++p) { - getFileInfoSeq(path + '/' + *p, infoSeq, compress, verbose); + getFileInfoSeq(path + '/' + *p, infoSeq, size, compress, verbose); } } else if(S_ISREG(buf.st_mode)) @@ -642,6 +642,11 @@ IcePatch2::getFileInfoSeq(const string& pa, FileInfoSeq& infoSeq, bool compress, { string pathBZ2 = path + ".bz2"; compressBytesToFile(pathBZ2, bytes, path.size()); + } + + if(size) + { + string pathBZ2 = path + ".bz2"; struct stat bufBZ2; if(stat(pathBZ2.c_str(), &bufBZ2) == -1) |