AuroraMiddleware/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2024-11-24 20:40:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

verbose error report in CLI

Browse Source 
PiperOrigin-RevId: 546833411
This commit is contained in:
Evgenii Kliuchnikov 2023-07-10 11:40:07 +00:00 committed by Evgenii Kliuchnikov
parent 70e7b1ae4a
commit 2e6164d7b0
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
c/dec/decode.c
View File

@ -2831,7 +2831,7 @@ BrotliDecoderErrorCode BrotliDecoderGetErrorCode(const BrotliDecoderState* s) {
const char* BrotliDecoderErrorString(BrotliDecoderErrorCode c) {
switch (c) {
#define BROTLI_ERROR_CODE_CASE_(PREFIX, NAME, CODE) \
case BROTLI_DECODER ## PREFIX ## NAME: return #NAME;
case BROTLI_DECODER ## PREFIX ## NAME: return #PREFIX #NAME;
#define BROTLI_NOTHING_
BROTLI_DECODER_ERROR_CODES_LIST(BROTLI_ERROR_CODE_CASE_, BROTLI_NOTHING_)
#undef BROTLI_ERROR_CODE_CASE_

29
c/tools/brotli.c
View File

@ -988,6 +988,22 @@ static void PrintFileProcessingProgress(Context* context) {
fprintf(stderr, " in %1.2f sec", (double)(context->end_time - context->start_time) / CLOCKS_PER_SEC);
}
static const char* PrettyDecoderErrorString(BrotliDecoderErrorCode code) {
/* "_ERROR_domain_" is in only added in newer versions. If CLI is linked
against older shared library, return error string as is; result might be
a bit confusing, e.g. "RESERVED" instead of "FORMAT_RESERVED" */
const char* prefix = "_ERROR_";
size_t prefix_len = strlen(prefix);
const char* error_str = BrotliDecoderErrorString(code);
size_t error_len = strlen(error_str);
if (error_len > prefix_len) {
if (strncmp(error_str, prefix, prefix_len) == 0) {
error_str += prefix_len;
}
}
return error_str;
}
static BROTLI_BOOL DecompressFile(Context* context, BrotliDecoderState* s) {
BrotliDecoderResult result = BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT;
InitializeBuffers(context);
@ -996,6 +1012,9 @@ static BROTLI_BOOL DecompressFile(Context* context, BrotliDecoderState* s) {
if (!HasMoreInput(context)) {
fprintf(stderr, "corrupt input [%s]\n",
PrintablePath(context->current_input_path));
if (context->verbosity > 0) {
fprintf(stderr, "reason: truncated input\n");
}
return BROTLI_FALSE;
}
if (!ProvideInput(context)) return BROTLI_FALSE;
@ -1008,6 +1027,9 @@ static BROTLI_BOOL DecompressFile(Context* context, BrotliDecoderState* s) {
if (has_more_input) {
fprintf(stderr, "corrupt input [%s]\n",
PrintablePath(context->current_input_path));
if (context->verbosity > 0) {
fprintf(stderr, "reason: extra input\n");
}
return BROTLI_FALSE;
}
if (context->verbosity > 0) {
@ -1017,9 +1039,14 @@ static BROTLI_BOOL DecompressFile(Context* context, BrotliDecoderState* s) {
fprintf(stderr, "\n");
}
return BROTLI_TRUE;
} else {
} else { /* result == BROTLI_DECODER_RESULT_ERROR */
fprintf(stderr, "corrupt input [%s]\n",
PrintablePath(context->current_input_path));
if (context->verbosity > 0) {
BrotliDecoderErrorCode error = BrotliDecoderGetErrorCode(s);
const char* error_str = PrettyDecoderErrorString(error);
fprintf(stderr, "reason: %s (%d)\n", error_str, error);
}
return BROTLI_FALSE;
}