Add metadata stream flag for archive.

Change flag bit to not collide with checksum id.
Handle '-T' option properly.
This commit is contained in:
Moinak Ghosh 2014-10-25 22:57:31 +05:30
parent e7081eb5a3
commit cc68550670
3 changed files with 5 additions and 2 deletions

View file

@ -304,7 +304,7 @@ extract_read_callback(struct archive *arc, void *ctx, const void **buf)
if (archive_request_is_metadata(arc) && pctx->meta_stream) { if (archive_request_is_metadata(arc) && pctx->meta_stream) {
int rv; int rv;
size_t len; size_t len;
/* /*
* Send the buf pointer over to the metadata thread. * Send the buf pointer over to the metadata thread.
*/ */

View file

@ -2522,6 +2522,8 @@ start_compress(pc_ctx_t *pctx, const char *filename, uint64_t chunksize, int lev
COMP_BAIL; COMP_BAIL;
} }
flags |= FLAG_ARCHIVE; flags |= FLAG_ARCHIVE;
if (pctx->meta_stream)
flags |= FLAG_META_STREAM;
} }
/* /*
@ -3244,6 +3246,7 @@ init_pc_context(pc_ctx_t *pctx, int argc, char *argv[])
case 'T': case 'T':
pctx->meta_stream = -1; pctx->meta_stream = -1;
break;
case '?': case '?':
default: default:

View file

@ -45,7 +45,7 @@ extern "C" {
#define FLAG_DEDUP 1 #define FLAG_DEDUP 1
#define FLAG_DEDUP_FIXED 2 #define FLAG_DEDUP_FIXED 2
#define FLAG_SINGLE_CHUNK 4 #define FLAG_SINGLE_CHUNK 4
#define FLAG_META_STREAM 256 #define FLAG_META_STREAM 4096
#define FLAG_ARCHIVE 2048 #define FLAG_ARCHIVE 2048
#define UTILITY_VERSION "3.1" #define UTILITY_VERSION "3.1"
#define MASK_CRYPTO_ALG 0x30 #define MASK_CRYPTO_ALG 0x30