Fossil SCM
Fix a harmless valgrind warning in the tarball generator.
Commit
64fc6d15e5a3fdc565e3b7eaf6d3cf902d5feff9
Parent
fcfe117b5a90223…
1 file changed
+3
-2
+3
-2
| --- src/tar.c | ||
| +++ src/tar.c | ||
| @@ -336,12 +336,13 @@ | ||
| 336 | 336 | unsigned int mTime /* Modification time */ |
| 337 | 337 | ){ |
| 338 | 338 | int i; |
| 339 | 339 | for(i=nName-1; i>0 && zName[i]!='/'; i--){} |
| 340 | 340 | if( i<=0 ) return; |
| 341 | - if( i < tball.nPrevDirAlloc && tball.zPrevDir[i]==0 && | |
| 342 | - memcmp(tball.zPrevDir, zName, i)==0 ) return; | |
| 341 | + if( i<tball.nPrevDirAlloc | |
| 342 | + && strncmp(tball.zPrevDir, zName, i)==0 | |
| 343 | + && tball.zPrevDir[i]==0 ) return; | |
| 343 | 344 | db_multi_exec("INSERT OR IGNORE INTO dir VALUES('%#q')", i, zName); |
| 344 | 345 | if( sqlite3_changes(g.db)==0 ) return; |
| 345 | 346 | tar_add_directory_of(zName, i-1, mTime); |
| 346 | 347 | tar_add_header(zName, i, 0755, mTime, 0, '5'); |
| 347 | 348 | if( i >= tball.nPrevDirAlloc ){ |
| 348 | 349 |
| --- src/tar.c | |
| +++ src/tar.c | |
| @@ -336,12 +336,13 @@ | |
| 336 | unsigned int mTime /* Modification time */ |
| 337 | ){ |
| 338 | int i; |
| 339 | for(i=nName-1; i>0 && zName[i]!='/'; i--){} |
| 340 | if( i<=0 ) return; |
| 341 | if( i < tball.nPrevDirAlloc && tball.zPrevDir[i]==0 && |
| 342 | memcmp(tball.zPrevDir, zName, i)==0 ) return; |
| 343 | db_multi_exec("INSERT OR IGNORE INTO dir VALUES('%#q')", i, zName); |
| 344 | if( sqlite3_changes(g.db)==0 ) return; |
| 345 | tar_add_directory_of(zName, i-1, mTime); |
| 346 | tar_add_header(zName, i, 0755, mTime, 0, '5'); |
| 347 | if( i >= tball.nPrevDirAlloc ){ |
| 348 |
| --- src/tar.c | |
| +++ src/tar.c | |
| @@ -336,12 +336,13 @@ | |
| 336 | unsigned int mTime /* Modification time */ |
| 337 | ){ |
| 338 | int i; |
| 339 | for(i=nName-1; i>0 && zName[i]!='/'; i--){} |
| 340 | if( i<=0 ) return; |
| 341 | if( i<tball.nPrevDirAlloc |
| 342 | && strncmp(tball.zPrevDir, zName, i)==0 |
| 343 | && tball.zPrevDir[i]==0 ) return; |
| 344 | db_multi_exec("INSERT OR IGNORE INTO dir VALUES('%#q')", i, zName); |
| 345 | if( sqlite3_changes(g.db)==0 ) return; |
| 346 | tar_add_directory_of(zName, i-1, mTime); |
| 347 | tar_add_header(zName, i, 0755, mTime, 0, '5'); |
| 348 | if( i >= tball.nPrevDirAlloc ){ |
| 349 |