static status_t ReadZipFileAux(zipFile zf, Message & msg, char * nameBuf, uint32 nameBufLen, bool loadData) { while(unzOpenCurrentFile(zf) == UNZ_OK) { unz_file_info fileInfo; if (unzGetCurrentFileInfo(zf, &fileInfo, nameBuf, nameBufLen, NULL, 0, NULL, 0) != UNZ_OK) return B_ERROR; // Add the new entry to the appropriate spot in the tree (demand-allocate sub-Messages as necessary) { const char * nulByte = strchr(nameBuf, '\0'); const bool isFolder = ((nulByte > nameBuf)&&(*(nulByte-1) == '/')); Message * m = &msg; StringTokenizer tok(true, nameBuf, "/"); const char * nextTok; while((nextTok = tok()) != NULL) { String fn(nextTok); if ((isFolder)||(tok.GetRemainderOfString())) { // Demand-allocate a sub-message MessageRef subMsg; if (m->FindMessage(fn, subMsg) != B_NO_ERROR) { if ((m->AddMessage(fn, Message()) != B_NO_ERROR)||(m->FindMessage(fn, subMsg) != B_NO_ERROR)) return B_ERROR; } m = subMsg(); } else { if (loadData) { ByteBufferRef bufRef = GetByteBufferFromPool((uint32) fileInfo.uncompressed_size); if ((bufRef() == NULL)||(unzReadCurrentFile(zf, bufRef()->GetBuffer(), bufRef()->GetNumBytes()) != (int32)bufRef()->GetNumBytes())||(m->AddFlat(fn, bufRef) != B_NO_ERROR)) return B_ERROR; } else if (m->AddInt64(fn, fileInfo.uncompressed_size) != B_NO_ERROR) return B_ERROR; } } } if (unzCloseCurrentFile(zf) != UNZ_OK) return B_ERROR; if (unzGoToNextFile(zf) != UNZ_OK) break; } return B_NO_ERROR; }