Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix harmless compiler warnings in tar.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
073725ae0cf983c683ad31d0cab8321a |
| User & Date: | drh 2011-08-12 12:13:30 |
Context
|
2011-08-14
| ||
| 23:14 | Merge the ben-testing branch into trunk. (check-in: 9a0c9958 user: drh tags: trunk) | |
| 07:21 | Merge trunk into ben-testing, adjusting for versionable settings. (check-in: 246ac307 user: ben tags: ben-testing) | |
|
2011-08-12
| ||
| 12:13 | Fix harmless compiler warnings in tar.c. (check-in: 073725ae user: drh tags: trunk) | |
| 11:54 | When forcing a rollback following an error, reset all SQL statement first so that the rollback can be successful. (check-in: 9515143d user: drh tags: trunk) | |
Changes
Changes to src/tar.c.
199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 ... 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 ... 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 |
int bHeader /* is this a 'x' type tar header? */
){
int split;
/* if this is a Pax Interchange header prepend "PaxHeader/"
** so we can tell files apart from metadata */
if( bHeader ){
int n;
blob_reset(&tball.pax);
blob_appendf(&tball.pax, "PaxHeader/%*.*s", nName, nName, zName);
zName = blob_buffer(&tball.pax);
nName = blob_size(&tball.pax);
}
/* find the split position */
................................................................................
char cType /* Type of object. '0'==file. '5'==directory */
){
/* set mode and modification time */
sqlite3_snprintf(8, (char*)&tball.aHdr[100], "%07o", iMode);
sqlite3_snprintf(12, (char*)&tball.aHdr[136], "%011o", mTime);
/* see if we need to output a Pax Interchange Header */
if( !is_iso646_name(zName, nName) ||
!tar_split_path(zName, nName, tball.aHdr, &tball.aHdr[345]) ){
int lastPage;
/* add a file name for interoperability with older programs */
approximate_split_path(zName, nName, tball.aHdr, &tball.aHdr[345], 1);
/* generate the Pax Interchange path header */
blob_reset(&tball.pax);
add_pax_header("path", zName, nName);
/* set the header length, and write the header */
sqlite3_snprintf(12, (char*)&tball.aHdr[124], "%011o",
................................................................................
gzip_step(blob_buffer(&tball.pax), blob_size(&tball.pax));
lastPage = blob_size(&tball.pax) % 512;
if( lastPage!=0 ){
gzip_step(tball.zSpaces, 512 - lastPage);
}
/* generate an approximate path for the regular header */
approximate_split_path(zName, nName, tball.aHdr, &tball.aHdr[345], 0);
}
/* set the size */
sqlite3_snprintf(12, (char*)&tball.aHdr[124], "%011o", iSize);
/* write the regular header */
cksum_and_write_header(cType);
}
|
< | | > | > | > |
199 200 201 202 203 204 205 206 207 208 209 210 211 212 ... 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 ... 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 |
int bHeader /* is this a 'x' type tar header? */
){
int split;
/* if this is a Pax Interchange header prepend "PaxHeader/"
** so we can tell files apart from metadata */
if( bHeader ){
blob_reset(&tball.pax);
blob_appendf(&tball.pax, "PaxHeader/%*.*s", nName, nName, zName);
zName = blob_buffer(&tball.pax);
nName = blob_size(&tball.pax);
}
/* find the split position */
................................................................................
char cType /* Type of object. '0'==file. '5'==directory */
){
/* set mode and modification time */
sqlite3_snprintf(8, (char*)&tball.aHdr[100], "%07o", iMode);
sqlite3_snprintf(12, (char*)&tball.aHdr[136], "%011o", mTime);
/* see if we need to output a Pax Interchange Header */
if( !is_iso646_name(zName, nName)
|| !tar_split_path(zName, nName, (char*)tball.aHdr, (char*)&tball.aHdr[345])
){
int lastPage;
/* add a file name for interoperability with older programs */
approximate_split_path(zName, nName, (char*)tball.aHdr,
(char*)&tball.aHdr[345], 1);
/* generate the Pax Interchange path header */
blob_reset(&tball.pax);
add_pax_header("path", zName, nName);
/* set the header length, and write the header */
sqlite3_snprintf(12, (char*)&tball.aHdr[124], "%011o",
................................................................................
gzip_step(blob_buffer(&tball.pax), blob_size(&tball.pax));
lastPage = blob_size(&tball.pax) % 512;
if( lastPage!=0 ){
gzip_step(tball.zSpaces, 512 - lastPage);
}
/* generate an approximate path for the regular header */
approximate_split_path(zName, nName, (char*)tball.aHdr,
(char*)&tball.aHdr[345], 0);
}
/* set the size */
sqlite3_snprintf(12, (char*)&tball.aHdr[124], "%011o", iSize);
/* write the regular header */
cksum_and_write_header(cType);
}
|