Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Store mode and mtime. Get extraction working. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
abdc055608478d30b36f9f9ed8b9eeb2 |
User & Date: | drh 2014-03-13 23:58:12.446 |
Context
2014-03-14
| ||
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 | |
17:49 | Basic check-in is working now. check-in: 9c655b6516 user: drh tags: trunk | |
Changes
Changes to sar.c.
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | ** drh@sqlite.org */ #include "sqlite3.h" #include <stdio.h> #include <stdarg.h> #include <stdlib.h> #include <zlib.h> /* ** 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" " -d Drop files from archive\n" ); exit(1); } /* ** The database schema: */ static const char zSchema[] = "CREATE TABLE IF NOT EXISTS sar(\n" | > > > > | > > | | > | > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 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 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | ** drh@sqlite.org */ #include "sqlite3.h" #include <stdio.h> #include <stdarg.h> #include <stdlib.h> #include <zlib.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include <dirent.h> /* ** 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" " -d Drop files from archive\n" ); exit(1); } /* ** The database schema: */ static const char zSchema[] = "CREATE TABLE IF NOT EXISTS sar(\n" " name TEXT PRIMARY KEY,\n" " mode INT,\n" " mtime INT,\n" " sz INT,\n" " data BLOB\n" ");" ; /* ** Prepared statement that needs finalizing before sqlite3_close(). */ static sqlite3_stmt *pStmt = 0; /* ** Open database connection */ static sqlite3 *db = 0; /* ** Close the database */ static void db_close(int commitFlag){ if( pStmt ){ sqlite3_finalize(pStmt); pStmt = 0; } if( db ){ if( commitFlag ){ sqlite3_exec(db, "COMMIT", 0, 0, 0); }else{ sqlite3_exec(db, "ROLLBACK", 0, 0, 0); } sqlite3_close(db); |
︙ | ︙ | |||
96 97 98 99 100 101 102 | if( rc ) errorMsg("Cannot open archive [%s]: %s\n", zArchive, sqlite3_errmsg(db)); sqlite3_exec(db, "BEGIN", 0, 0, 0); sqlite3_exec(db, zSchema, 0, 0, 0); } /* | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | > | < | > | > | < < < | < < < > | | | < < > > | | < | | < | > > > | | > | | > > > > > > > > > > > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 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 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 | if( rc ) errorMsg("Cannot open archive [%s]: %s\n", zArchive, sqlite3_errmsg(db)); sqlite3_exec(db, "BEGIN", 0, 0, 0); sqlite3_exec(db, zSchema, 0, 0, 0); } /* ** Prepare the pStmt statement. */ static void db_prepare(const char *zSql){ int rc; sqlite3_finalize(pStmt); rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0); if( rc ){ errorMsg("Error: %s\nwhile preparing: %s\n", sqlite3_errmsg(db), zSql); } } /* ** Read a file from disk into memory obtained from sqlite3_malloc(). ** Compress the file as it is read in. ** ** Return the original size and the compressed size of the file in ** *pSizeOrig and *pSizeCompr, respectively. */ static char *read_file(const char *zFilename, int *pSizeOrig, int *pSizeCompr){ FILE *in; char *zIn; long int nIn; char *zCompr; unsigned long int nCompr; int rc; in = fopen(zFilename, "rb"); if( in==0 ) errorMsg("cannot open \"%s\" for reading\n", zFilename); fseek(in, 0, SEEK_END); nIn = ftell(in); rewind(in); zIn = sqlite3_malloc( nIn+1 ); if( zIn==0 ) errorMsg("cannot malloc for %d bytes\n", nIn+1); if( fread(zIn, nIn, 1, in)!=1 ){ errorMsg("unable to read %d bytes of file %s\n", nIn, zFilename); } nCompr = 13 + nIn + (nIn+999)/1000; zCompr = sqlite3_malloc( nCompr+1 ); if( zCompr==0 ) errorMsg("cannot malloc for %d bytes\n", nCompr+1); rc = compress(zCompr, &nCompr, zIn, nIn); if( rc!=Z_OK ) errorMsg("Cannot compress %s\n", zFilename); sqlite3_free(zIn); *pSizeOrig = nIn; *pSizeCompr = (int)nCompr; return zCompr; } /* ** Make sure the parent directory for zName exists. Create it if it does ** not exist. */ static void make_parent_directory(const char *zName){ char *zParent; int i, j, rc; for(i=j=0; zName[i]; i++) if( zName[i]=='/' ) j = i; if( j>0 ){ zParent = sqlite3_mprintf("%.*s", j, zName); if( zParent==0 ) errorMsg("mprintf failed\n"); while( j>0 && zParent[j]=='/' ) j--; zParent[j] = 0; if( j>0 && access(zParent,F_OK)!=0 ){ make_parent_directory(zParent); rc = mkdir(zParent, 0777); if( rc ) errorMsg("cannot create directory: %s\n", zParent); } sqlite3_free(zParent); } } /* ** Write a file or a directory. ** ** Create any missing directories leading up to the given file or directory. ** Also set the access mode and the modification time. ** ** The content is compressed and needs to be decompressed before writing. */ static void write_file( const char *zFilename, int iMode, sqlite3_int64 mtime, int sz, const char *pCompr, int nCompr ){ char *pOut; unsigned long int nOut; int rc; FILE *out; make_parent_directory(zFilename); if( pCompr==0 ){ rc = mkdir(zFilename, iMode); if( rc ) errorMsg("cannot make directory: %s\n", zFilename); return; } pOut = sqlite3_malloc( sz+1 ); if( pOut==0 ) errorMsg("cannot allocate %d bytes\n", sz+1); nOut = sz; rc = uncompress(pOut, &nOut, pCompr, nCompr); if( rc!=Z_OK ) errorMsg("uncompress failed for %s\n", zFilename); out = fopen(zFilename, "wb"); if( out==0 ) errorMsg("cannot open for writing: %s\n", zFilename); if( fwrite(pOut, nOut, 1, out)!=1 ){ errorMsg("failed to write: %s\n", zFilename); } sqlite3_free(pOut); fclose(out); rc = chmod(zFilename, iMode&0777); if( rc ) errorMsg("cannot change mode to %03o: %s\n", iMode, zFilename); } /* ** Error out if there are any issues with the given filename */ static void check_filename(const char *z){ if( strncmp(z, "../", 3)==0 || sqlite3_strglob("*/../*", z)==0 ){ errorMsg("Filename with '..' in its path: %s\n", z); } if( sqlite3_strglob("*\\*", z)==0 ){ errorMsg("Filename with '\\' in its name: %s\n", z); } } /* ** Add a file to the database. */ static void add_file( const char *zFilename /* Name of file to add */ ){ int rc; struct stat x; char *zContent; int szOrig; int szCompr; const char *zName; check_filename(zFilename); rc = stat(zFilename, &x); if( rc ) errorMsg("no such file or directory: %s\n", zFilename); if( x.st_size>1000000000 ){ errorMsg("file too big: %s\n", zFilename); } if( pStmt==0 ){ db_prepare("REPLACE INTO sar(name,mode,mtime,sz,data)" " VALUES(?1,?2,?3,?4,?5)"); } zName = zFilename; while( zName[0]=='/' ) zName++; 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); add_file(zSubpath); sqlite3_free(zSubpath); } } } } /* ** List of command-line arguments */ typedef struct NameList NameList; struct NameList { 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 names 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( strcmp(pList->azName[i], z)==0 ){ rc = 1; break; } } } sqlite3_result_int(context, rc); } int main(int argc, char **argv){ const char *zArchive = 0; char **azFiles = 0; int nFiles = 0; int listFlag = 0; int extractFlag = 0; int i; if( sqlite3_strglob("*/unsar", argv[0])==0 ){ extractFlag = 1; } for(i=1; i<argc; i++){ if( argv[i][0]=='-' ){ if( strcmp(argv[i],"-l")==0 ){ |
︙ | ︙ | |||
172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 | azFiles = &argv[i]; nFiles = argc - i; break; } } if( zArchive==0 ) showHelp(argv[0]); if( listFlag ){ }else if( extractFlag ){ }else{ if( azFiles==0 ) showHelp(argv[0]); db_open(zArchive, 1); for(i=0; i<nFiles; i++){ add_file(azFiles[i]); } db_close(1); } return 0; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 | azFiles = &argv[i]; nFiles = argc - i; break; } } if( zArchive==0 ) showHelp(argv[0]); if( listFlag ){ int rc; db_open(zArchive, 0); 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)); } db_close(1); }else if( extractFlag ){ const char *zSql; int rc; db_open(zArchive, 0); if( nFiles ){ NameList x; x.azName = azFiles; x.nName = nFiles; sqlite3_create_function(db, "name_on_list", 1, SQLITE_UTF8, (char*)&x, name_on_list, 0, 0); zSql = "SELECT name, mode, mtime, sz, data FROM sar" " WHERE name_on_list(filename)"; }else{ zSql = "SELECT name, mode, mtime, sz, data FROM sar"; } 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); } 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]); } db_close(1); } return 0; } |