Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add the -d option to delete content from the SQLAR. Accept GLOB patterns as filenames for -l, -e, and -d. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
b45aa9345e29efc715ec213f12ef4d61 |
User & Date: | drh 2016-08-22 17:23:50.331 |
Context
2016-09-19
| ||
12:10 | Update the built-in SQLite to the latest 3.15.0 alpha version. check-in: 72b6147da3 user: drh tags: trunk | |
2016-08-22
| ||
17:23 | Add the -d option to delete content from the SQLAR. Accept GLOB patterns as filenames for -l, -e, and -d. check-in: b45aa9345e user: drh tags: trunk | |
2016-07-11
| ||
19:22 | Update to the version 3.13.0 of SQLite. check-in: 52199b0fb4 user: drh tags: trunk | |
Changes
Changes to sqlar.c.
︙ | ︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | /* ** Show a help message and quit. */ static void showHelp(const char *argv0){ fprintf(stderr, "Usage: %s [options] archive [files...]\n", argv0); fprintf(stderr, "Options:\n" " -e Prompt for passphrase. -ee to scramble the prompt\n" " -l List files in archive\n" " -n Do not compress files\n" " -x Extract files from archive\n" " -v Verbose output\n" ); exit(1); } /* ** The database schema: */ | > | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | /* ** Show a help message and quit. */ static void showHelp(const char *argv0){ fprintf(stderr, "Usage: %s [options] archive [files...]\n", argv0); fprintf(stderr, "Options:\n" " -d Delete files from the archive\n" " -e Prompt for passphrase. -ee to scramble the prompt\n" " -l List files in archive\n" " -n Do not compress files\n" " -x Extract files from archive\n" " -v Verbose output\n" ); exit(1); } /* ** The database schema: */ static const char zSchema[] = "CREATE TABLE IF NOT EXISTS sqlar(\n" " name TEXT PRIMARY KEY,\n" " mode INT,\n" " mtime INT,\n" " sz INT,\n" " data BLOB\n" ");" |
︙ | ︙ | |||
192 193 194 195 196 197 198 199 200 201 202 | while( isspace(z[0]) ) z++; for(i=0; i<MX_PASSPHRASE-1; i++){ zPassphrase[i] = z[i]; } while( i>0 && isspace(z[i-1]) ){ i--; } zPassphrase[i] = 0; } /* ** Open the database. */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | while( isspace(z[0]) ) z++; for(i=0; i<MX_PASSPHRASE-1; i++){ zPassphrase[i] = z[i]; } while( i>0 && isspace(z[i-1]) ){ i--; } zPassphrase[i] = 0; } /* ** List of command-line arguments */ typedef struct NameList NameList; struct NameList { const char **azName; /* List of names */ int nName; /* Number of names on the list */ }; /* ** Inplementation of SQL function "name_on_list(X)". Return ** true if X is on the list of GLOB patterns given on the command-line. */ static void name_on_list( sqlite3_context *context, int argc, sqlite3_value **argv ){ NameList *pList = (NameList*)sqlite3_user_data(context); int i; int rc = 0; const char *z = (const char*)sqlite3_value_text(argv[0]); if( z!=0 ){ for(i=0; i<pList->nName; i++){ if( sqlite3_strglob(pList->azName[i], z)==0 ){ rc = 1; break; } } } sqlite3_result_int(context, rc); } /* ** SQL functions that always true. This is used in place of ** name_on_list() when no command-line arguments are given. */ static void alwaysTrue(sqlite3_context *ctx, int n, sqlite3_value **v){ sqlite3_result_int(ctx, 1); } /* ** Open the database. */ static void db_open( const char *zArchive, int writeFlag, int seeFlag, const char **azFiles, int nFiles ){ int rc; int fg; NameList *x = 0; if( writeFlag ){ fg = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE; }else{ fg = SQLITE_OPEN_READONLY; } rc = sqlite3_open_v2(zArchive, &db, fg, 0); if( rc ) errorMsg("Cannot open archive [%s]: %s\n", zArchive, sqlite3_errmsg(db)); if( azFiles!=0 && nFiles>0 ){ x = sqlite3_malloc( sizeof(NameList) ); if( x==0 ) errorMsg("Out of memory"); x->azName = azFiles; x->nName = nFiles; sqlite3_create_function(db, "name_on_list", 1, SQLITE_UTF8, (char*)x, name_on_list, 0, 0); }else{ sqlite3_create_function(db, "name_on_list", 1, SQLITE_UTF8, 0, alwaysTrue, 0, 0); } if( seeFlag ){ char *zSql; char zPassPhrase[MX_PASSPHRASE+1]; #ifndef SQLITE_HAS_CODEC printf("WARNING: The passphrase is a no-op because this build of\n" "sqlar is compiled without encryption capabilities.\n"); #endif |
︙ | ︙ | |||
414 415 416 417 418 419 420 | if( verboseFlag ){ if( szCompr<szOrig ){ int pct = szOrig ? (100*(sqlite3_int64)szCompr)/szOrig : 0; printf(" added: %s (deflate %d%%)\n", zFilename, 100-pct); }else{ printf(" added: %s\n", zFilename); } | | | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | if( verboseFlag ){ if( szCompr<szOrig ){ int pct = szOrig ? (100*(sqlite3_int64)szCompr)/szOrig : 0; printf(" added: %s (deflate %d%%)\n", zFilename, 100-pct); }else{ printf(" added: %s\n", zFilename); } } }else{ sqlite3_bind_int(pStmt, 4, 0); sqlite3_bind_null(pStmt, 5); if( verboseFlag ) printf(" added: %s\n", zFilename); } rc = sqlite3_step(pStmt); if( rc!=SQLITE_DONE ){ |
︙ | ︙ | |||
444 445 446 447 448 449 450 | sqlite3_free(zSubpath); } closedir(d); } } } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | > > | | > > > | | > | > > > > | < < < < < < | | < < < | > > | | 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 | sqlite3_free(zSubpath); } closedir(d); } } } int main(int argc, char **argv){ const char *zArchive = 0; const char **azFiles = 0; int nFiles = 0; int listFlag = 0; int extractFlag = 0; int verboseFlag = 0; int noCompress = 0; int seeFlag = 0; int deleteFlag = 0; int i, j; if( sqlite3_strglob("*/unsqlar", argv[0])==0 ){ extractFlag = 1; } for(i=1; i<argc; i++){ if( argv[i][0]=='-' ){ for(j=1; argv[i][j]; j++){ switch( argv[i][j] ){ case 'l': listFlag = 1; break; case 'n': noCompress = 1; break; case 'v': verboseFlag = 1; break; case 'x': extractFlag = 1; break; case 'e': seeFlag++; break; case 'd': deleteFlag = 1; break; case '-': break; default: showHelp(argv[0]); } } }else if( zArchive==0 ){ zArchive = argv[i]; }else{ azFiles = (const char**)&argv[i]; nFiles = argc - i; break; } } if( zArchive==0 ) showHelp(argv[0]); if( listFlag || deleteFlag ){ if( deleteFlag && nFiles==0 ){ errorMsg("Specify one or more files to delete on the command-line"); } db_open(zArchive, deleteFlag, seeFlag, azFiles, nFiles); if( verboseFlag ){ db_prepare( "SELECT name, sz, length(data), mode, datetime(mtime,'unixepoch')" " FROM sqlar WHERE name_on_list(name) ORDER BY name" ); while( sqlite3_step(pStmt)==SQLITE_ROW ){ if( deleteFlag ) printf("DELETE "); printf("%10d %10d %03o %s %s\n", sqlite3_column_int(pStmt, 1), sqlite3_column_int(pStmt, 2), sqlite3_column_int(pStmt, 3)&0777, sqlite3_column_text(pStmt, 4), sqlite3_column_text(pStmt, 0)); } }else{ db_prepare( "SELECT name FROM sqlar WHERE name_on_list(name) ORDER BY name" ); while( sqlite3_step(pStmt)==SQLITE_ROW ){ if( deleteFlag ) printf("DELETE "); printf("%s\n", sqlite3_column_text(pStmt,0)); } } if( deleteFlag ){ sqlite3_exec(db, "DELETE FROM sqlar WHERE name_on_list(name)", 0, 0, 0); } db_close(1); }else if( extractFlag ){ const char *zSql; db_open(zArchive, 0, seeFlag, azFiles, nFiles); zSql = "SELECT name, mode, mtime, sz, data FROM sqlar" " WHERE name_on_list(filename)"; db_prepare(zSql); while( sqlite3_step(pStmt)==SQLITE_ROW ){ const char *zFN = (const char*)sqlite3_column_text(pStmt, 0); check_filename(zFN); if( zFN[0]=='/' ){ errorMsg("absolute pathname: %s\n", zFN); } if( sqlite3_column_type(pStmt,4)==SQLITE_BLOB && access(zFN, F_OK)==0 ){ errorMsg("file already exists: %s\n", zFN); } if( verboseFlag ) printf("%s\n", zFN); write_file(zFN, sqlite3_column_int(pStmt,1), sqlite3_column_int64(pStmt,2), sqlite3_column_int(pStmt,3), sqlite3_column_blob(pStmt,4), sqlite3_column_bytes(pStmt,4)); } db_close(1); }else{ if( azFiles==0 ){ errorMsg("Specify one or more files to add on the command-line"); } db_open(zArchive, 1, seeFlag, 0, 0); for(i=0; i<nFiles; i++){ add_file(azFiles[i], verboseFlag, noCompress); } db_close(1); } return 0; } |