Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add the -v (verbose) command-line option. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
b7c6557186dc14fca19d58d1aca0e609 |
User & Date: | drh 2014-03-14 00:19:33.523 |
Context
2014-03-14
| ||
00:22 | Add a missing fclose() to fix a file-descriptor leak. check-in: c3c0cdcaca user: drh tags: trunk | |
00:19 | Add the -v (verbose) command-line option. check-in: b7c6557186 user: drh tags: trunk | |
2014-03-13
| ||
23:58 | Store mode and mtime. Get extraction working. check-in: abdc055608 user: drh tags: trunk | |
Changes
Changes to sar.c.
︙ | ︙ | |||
26 27 28 29 30 31 32 | ** 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" " -l List files in archive\n" " -x Extract files from archive\n" | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | ** 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" " -l List files in archive\n" " -x Extract files from archive\n" " -v Verbose output\n" ); exit(1); } /* ** The database schema: */ |
︙ | ︙ | |||
234 235 236 237 238 239 240 | } } /* ** Add a file to the database. */ static void add_file( | | > | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | } } /* ** Add a file to the database. */ static void add_file( const char *zFilename, /* Name of file to add */ int verboseFlag /* If true, show each file added */ ){ int rc; struct stat x; char *zContent; int szOrig; int szCompr; const char *zName; |
︙ | ︙ | |||
262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC); sqlite3_bind_int(pStmt, 2, x.st_mode); sqlite3_bind_int64(pStmt, 3, x.st_mtime); if( S_ISREG(x.st_mode) ){ char *zContent = read_file(zFilename, &szOrig, &szCompr); sqlite3_bind_int(pStmt, 4, szOrig); sqlite3_bind_blob(pStmt, 5, zContent, szCompr, sqlite3_free); }else{ sqlite3_bind_int(pStmt, 4, 0); sqlite3_bind_null(pStmt, 5); } rc = sqlite3_step(pStmt); if( rc!=SQLITE_DONE ){ errorMsg("Insert failed for %s: %s\n", zFilename, sqlite3_errmsg(db)); } sqlite3_reset(pStmt); if( S_ISDIR(x.st_mode) ){ DIR *d; struct dirent *pEntry; char *zSubpath; d = opendir(zFilename); if( d ){ while( (pEntry = readdir(d))!=0 ){ if( pEntry->d_name[0]=='.' ) continue; char *zSubpath = sqlite3_mprintf("%s/%s", zFilename, pEntry->d_name); | > > > > > | | 263 264 265 266 267 268 269 270 271 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 300 | sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC); sqlite3_bind_int(pStmt, 2, x.st_mode); sqlite3_bind_int64(pStmt, 3, x.st_mtime); if( S_ISREG(x.st_mode) ){ char *zContent = read_file(zFilename, &szOrig, &szCompr); sqlite3_bind_int(pStmt, 4, szOrig); sqlite3_bind_blob(pStmt, 5, zContent, szCompr, sqlite3_free); if( verboseFlag ){ int pct = (100*(sqlite3_int64)szCompr)/szOrig; printf(" added: %s (deflate %d%%)\n", zFilename, 100-pct); } }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 ){ errorMsg("Insert failed for %s: %s\n", zFilename, sqlite3_errmsg(db)); } sqlite3_reset(pStmt); if( S_ISDIR(x.st_mode) ){ DIR *d; struct dirent *pEntry; char *zSubpath; d = opendir(zFilename); if( d ){ while( (pEntry = readdir(d))!=0 ){ if( pEntry->d_name[0]=='.' ) continue; char *zSubpath = sqlite3_mprintf("%s/%s", zFilename, pEntry->d_name); add_file(zSubpath, verboseFlag); sqlite3_free(zSubpath); } } } } /* |
︙ | ︙ | |||
326 327 328 329 330 331 332 | int main(int argc, char **argv){ const char *zArchive = 0; char **azFiles = 0; int nFiles = 0; int listFlag = 0; int extractFlag = 0; | > | > | | < > | | | > > | | | | | | | | | | | > > > > > > > > | 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 | int main(int argc, char **argv){ const char *zArchive = 0; char **azFiles = 0; int nFiles = 0; int listFlag = 0; int extractFlag = 0; int verboseFlag = 0; int i, j; if( sqlite3_strglob("*/unsar", 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 'v': verboseFlag = 1; break; case 'x': extractFlag = 1; break; case '-': break; default: showHelp(argv[0]); } } }else if( zArchive==0 ){ zArchive = argv[i]; }else{ azFiles = &argv[i]; nFiles = argc - i; break; } } if( zArchive==0 ) showHelp(argv[0]); if( listFlag ){ int rc; db_open(zArchive, 0); if( verboseFlag ){ db_prepare( "SELECT name, sz, length(data), mode, datetime(mtime,'unixepoch')" " FROM sar ORDER BY name" ); while( sqlite3_step(pStmt)==SQLITE_ROW ){ 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 sar ORDER BY name" ); while( sqlite3_step(pStmt)==SQLITE_ROW ){ printf("%s\n", sqlite3_column_text(pStmt,0)); } } db_close(1); }else if( extractFlag ){ const char *zSql; int rc; db_open(zArchive, 0); if( nFiles ){ |
︙ | ︙ | |||
390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 | 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); } 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 ) showHelp(argv[0]); db_open(zArchive, 1); for(i=0; i<nFiles; i++){ | > | | 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 | 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 ) showHelp(argv[0]); db_open(zArchive, 1); for(i=0; i<nFiles; i++){ add_file(azFiles[i], verboseFlag); } db_close(1); } return 0; } |