FEX-Emu/xxHash
1
0
Fork 0
mirror of https://github.com/FEX-Emu/xxHash.git synced 2024-11-23 14:39:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add the ability to parse BSD style --check lines.

Browse Source
This commit is contained in:
Wayne Davison 2020-07-05 15:39:38 -07:00
parent 26fded0503
commit 5ffd33ef3a
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xxhsum.1
View File

@ -61,6 +61,10 @@ Read xxHash sums from \fIFILE\fR and check them
Don\'t print OK for each successfully verified file
.
.TP
\fB\-\-tag\fR
Output in the BSD style.
.
.TP
\fB\-\-strict\fR
Return an error code if any line in the file is invalid, not just if some checksums are wrong\. This policy is disabled by default, though UI will prompt an informational message if any line in the file is detected invalid\.
.

3
xxhsum.1.md
View File

@ -54,6 +54,9 @@ OPTIONS
* `-q`, `--quiet`:
Don't print OK for each successfully verified file
* `--tag`:
Output in the BSD style.
* `--strict`:
Return an error code if any line in the file is invalid,
not just if some checksums are wrong.

29
xxhsum.c
View File

@ -1811,19 +1811,36 @@ static CanonicalFromStringResult canonicalFromString(unsigned char* dst,
*
* <8, 16, or 32 hexadecimal char> <space> <space> <filename...> <'\0'>
*/
static ParseLineResult parseLine(ParsedLine* parsedLine, const char* line)
static ParseLineResult parseLine(ParsedLine* parsedLine, char* line)
{
const char* const firstSpace = strchr(line, ' ');
const char* hash_ptr;
int hash_len;
if (firstSpace == NULL) return ParseLine_invalidFormat;
parsedLine->filename = NULL;
parsedLine->xxhBits = 0;
switch (firstSpace - line)
if (firstSpace[1] == '(') {
char* lastSpace = strrchr(line, ' ');
if (lastSpace - firstSpace < 5) return ParseLine_invalidFormat;
if (lastSpace[-1] != '=' || lastSpace[-2] != ' ' || lastSpace[-3] != ')') return ParseLine_invalidFormat;
lastSpace[-3] = '\0'; /* Terminate the filename */
hash_ptr = lastSpace + 1;
hash_len = strlen(hash_ptr);
/* NOTE: This currently ignores the hash description at the start of the string.
* In the future we should parse it and verify that it matches the hash length.
* It could also be used to allow both XXH64 & XXH3_64bits to be differentiated. */
} else {
hash_ptr = line;
hash_len = firstSpace - line;
}
switch (hash_len)
{
case 8:
{ XXH32_canonical_t* xxh32c = &parsedLine->canonical.xxh32;
if (canonicalFromString(xxh32c->digest, sizeof(xxh32c->digest), line)
if (canonicalFromString(xxh32c->digest, sizeof(xxh32c->digest), hash_ptr)
!= CanonicalFromString_ok) {
return ParseLine_invalidFormat;
}
@ -1833,7 +1850,7 @@ static ParseLineResult parseLine(ParsedLine* parsedLine, const char* line)
case 16:
{ XXH64_canonical_t* xxh64c = &parsedLine->canonical.xxh64;
if (canonicalFromString(xxh64c->digest, sizeof(xxh64c->digest), line)
if (canonicalFromString(xxh64c->digest, sizeof(xxh64c->digest), hash_ptr)
!= CanonicalFromString_ok) {
return ParseLine_invalidFormat;
}
@ -1843,7 +1860,7 @@ static ParseLineResult parseLine(ParsedLine* parsedLine, const char* line)
case 32:
{ XXH128_canonical_t* xxh128c = &parsedLine->canonical.xxh128;
if (canonicalFromString(xxh128c->digest, sizeof(xxh128c->digest), line)
if (canonicalFromString(xxh128c->digest, sizeof(xxh128c->digest), hash_ptr)
!= CanonicalFromString_ok) {
return ParseLine_invalidFormat;
}
@ -2284,7 +2301,7 @@ static int XXH_main(int argc, const char* const* argv)
if (!strcmp(argument, "--warn")) { warn = 1; continue; }
if (!strcmp(argument, "--help")) { return usage_advanced(exename); }
if (!strcmp(argument, "--version")) { DISPLAY(FULL_WELCOME_MESSAGE(exename)); BMK_sanityCheck(); return 0; }
if (!strcmp(argument, "--tag")) { convention = display_bsd; continue; } /* hidden option */
if (!strcmp(argument, "--tag")) { convention = display_bsd; continue; }
if (*argument!='-') {
if (filenamesStart==0) filenamesStart=i; /* only supports a continuous list of filenames */