Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the SQL archive generator so that for a check-in containing no files it generates an empty SQL archive instead of an empty file. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: | 31b9822d697eaba8713ca732a4f076a78be98478158327a9089ecc55227ca3c0 |
| User & Date: | drh 2017-12-08 03:24:39 |
Context
|
2017-12-09
| ||
| 02:47 | The graph arrowhead control was inverted due to a missing "!" character in the graph.js file. check-in: 561fa8a3 user: drh tags: trunk | |
|
2017-12-08
| ||
| 03:24 | Fix the SQL archive generator so that for a check-in containing no files it generates an empty SQL archive instead of an empty file. check-in: 31b9822d user: drh tags: trunk | |
| 00:07 | Fix the "fossil sqlar" command so that it works for the empty initial check-in. check-in: 3e2b5c46 user: drh tags: trunk | |
Changes
Changes to src/zip.c.
272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 ... 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 ... 426 427 428 429 430 431 432 433 434 435 436 437 438 439 ... 699 700 701 702 703 704 705 706 707 708 709 710 711 712 |
char zHdr[30];
char zExTime[13];
char zBuf[100];
char zOutBuf[100000];
/* Fill in as much of the header as we know.
*/
nBlob = pFile ? blob_size(pFile) : 0;
if( pFile ){ /* This is a file, possibly empty... */
iMethod = (nBlob>0) ? 8 : 0; /* Cannot compress zero bytes. */
switch( mPerm ){
case PERM_LNK: iMode = 0120755; break;
case PERM_EXE: iMode = 0100755; break;
default: iMode = 0100644; break;
}
}else{ /* This is a directory, no blob... */
iMethod = 0;
iMode = 040755;
}
nameLen = strlen(zName);
memset(zHdr, 0, sizeof(zHdr));
put32(&zHdr[0], 0x04034b50);
put16(&zHdr[4], 0x000a);
put16(&zHdr[6], 0x0800);
put16(&zHdr[8], iMethod);
put16(&zHdr[10], dosTime);
put16(&zHdr[12], dosDate);
................................................................................
static void zip_add_file_to_sqlar(
Archive *p,
const char *zName,
const Blob *pFile,
int mPerm
){
int nName = strlen(zName);
if( p->db==0 ){
assert( p->vfs.zName==0 );
p->vfs.zName = (const char*)mprintf("archivevfs%p", (void*)p);
p->vfs.iVersion = 1;
p->vfs.szOsFile = sizeof(ArchiveFile);
p->vfs.mxPathname = 512;
................................................................................
);
assert( p->pInsert );
sqlite3_bind_int64(p->pInsert, 3, unixTime);
blob_zero(p->pBlob);
}
if( pFile==0 ){
/* Directory. */
if( zName[nName-1]=='/' ) nName--;
sqlite3_bind_text(p->pInsert, 1, zName, nName, SQLITE_STATIC);
sqlite3_bind_int(p->pInsert, 2, 040755);
sqlite3_bind_int(p->pInsert, 4, 0);
sqlite3_bind_null(p->pInsert, 5);
................................................................................
zName = blob_str(&filename);
zip_add_folders(&sArchive, zName);
zip_add_file(&sArchive, zName, &tagslist, 0);
blob_reset(&tagslist);
}
}
manifest_file_rewind(pManifest);
while( (pFile = manifest_file_next(pManifest,0))!=0 ){
int fid;
if( pInclude!=0 && !glob_match(pInclude, pFile->zName) ) continue;
if( glob_match(pExclude, pFile->zName) ) continue;
fid = uuid_to_rid(pFile->zUuid, 0);
if( fid ){
content_get(fid, &file);
|
> > < | > > |
272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 ... 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 ... 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 ... 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 |
char zHdr[30]; char zExTime[13]; char zBuf[100]; char zOutBuf[100000]; /* Fill in as much of the header as we know. */ nameLen = (int)strlen(zName); if( nameLen==0 ) return; nBlob = pFile ? blob_size(pFile) : 0; if( pFile ){ /* This is a file, possibly empty... */ iMethod = (nBlob>0) ? 8 : 0; /* Cannot compress zero bytes. */ switch( mPerm ){ case PERM_LNK: iMode = 0120755; break; case PERM_EXE: iMode = 0100755; break; default: iMode = 0100644; break; } }else{ /* This is a directory, no blob... */ iMethod = 0; iMode = 040755; } memset(zHdr, 0, sizeof(zHdr)); put32(&zHdr[0], 0x04034b50); put16(&zHdr[4], 0x000a); put16(&zHdr[6], 0x0800); put16(&zHdr[8], iMethod); put16(&zHdr[10], dosTime); put16(&zHdr[12], dosDate); ................................................................................ static void zip_add_file_to_sqlar( Archive *p, const char *zName, const Blob *pFile, int mPerm ){ int nName = (int)strlen(zName); if( p->db==0 ){ assert( p->vfs.zName==0 ); p->vfs.zName = (const char*)mprintf("archivevfs%p", (void*)p); p->vfs.iVersion = 1; p->vfs.szOsFile = sizeof(ArchiveFile); p->vfs.mxPathname = 512; ................................................................................ ); assert( p->pInsert ); sqlite3_bind_int64(p->pInsert, 3, unixTime); blob_zero(p->pBlob); } if( nName==0 ) return; if( pFile==0 ){ /* Directory. */ if( zName[nName-1]=='/' ) nName--; sqlite3_bind_text(p->pInsert, 1, zName, nName, SQLITE_STATIC); sqlite3_bind_int(p->pInsert, 2, 040755); sqlite3_bind_int(p->pInsert, 4, 0); sqlite3_bind_null(p->pInsert, 5); ................................................................................ zName = blob_str(&filename); zip_add_folders(&sArchive, zName); zip_add_file(&sArchive, zName, &tagslist, 0); blob_reset(&tagslist); } } manifest_file_rewind(pManifest); zip_add_file(&sArchive, "", 0, 0); while( (pFile = manifest_file_next(pManifest,0))!=0 ){ int fid; if( pInclude!=0 && !glob_match(pInclude, pFile->zName) ) continue; if( glob_match(pExclude, pFile->zName) ) continue; fid = uuid_to_rid(pFile->zUuid, 0); if( fid ){ content_get(fid, &file); |