Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | minor buffer length fix for the previous change |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
091499ec1a4002f7e2860c5b10fb5628 |
| User & Date: | stephan 2008-02-08 22:02:54 |
Context
|
2008-02-08
| ||
| 22:31 | Change zip archiver to make use of blob.c mechanisms for adding prefixes to file names. Remove C constructs that are not commonly supported. (check-in: 4bbb00a8 user: drh tags: trunk) | |
| 22:02 | minor buffer length fix for the previous change (check-in: 091499ec user: stephan tags: trunk) | |
| 21:52 | Merge in changes from Andreas's branch. (check-in: 6b78df38 user: drh tags: trunk) | |
Changes
Changes to src/zip.c.
302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 |
char * zHead = aSBuf + prxLen;
/* Rather than use a lot of mprintf()s here, we reuse aSBuf as a
** buffer for the prefix + current file name. zHead keeps track
** of where we should write file names to this buffer.
*/
if( manifest_parse(&m, &mfile) ){
zip_set_timedate(m.rDate);
snprintf( zHead, bufsize, "manifest" );
zip_add_file(aSBuf, &file);
sha1sum_blob(&file, &hash);
blob_reset(&file);
blob_append(&hash, "\n", 1);
snprintf( zHead, bufsize, "manifest.uuid" );
zip_add_file(aSBuf, &hash);
blob_reset(&hash);
for(i=0; i<m.nFile; i++){
int fid = uuid_to_rid(m.aFile[i].zUuid, 0);
if( fid ){
content_get(fid, &file);
snprintf( zHead, bufsize, "%s", m.aFile[i].zName );
zip_add_file( aSBuf, &file);
blob_reset(&file);
}
}
manifest_clear(&m);
}else{
blob_reset(&mfile);
|
| | | |
302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 |
char * zHead = aSBuf + prxLen;
/* Rather than use a lot of mprintf()s here, we reuse aSBuf as a
** buffer for the prefix + current file name. zHead keeps track
** of where we should write file names to this buffer.
*/
if( manifest_parse(&m, &mfile) ){
zip_set_timedate(m.rDate);
snprintf( zHead, bufsize-prxLen, "manifest" );
zip_add_file(aSBuf, &file);
sha1sum_blob(&file, &hash);
blob_reset(&file);
blob_append(&hash, "\n", 1);
snprintf( zHead, bufsize-prxLen, "manifest.uuid" );
zip_add_file(aSBuf, &hash);
blob_reset(&hash);
for(i=0; i<m.nFile; i++){
int fid = uuid_to_rid(m.aFile[i].zUuid, 0);
if( fid ){
content_get(fid, &file);
snprintf( zHead, bufsize-prxLen, "%s", m.aFile[i].zName );
zip_add_file( aSBuf, &file);
blob_reset(&file);
}
}
manifest_clear(&m);
}else{
blob_reset(&mfile);
|