diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_kv.c | 55 |
1 files changed, 39 insertions, 16 deletions
diff --git a/src/os_kv.c b/src/os_kv.c index 9260852db..6ecec6309 100644 --- a/src/os_kv.c +++ b/src/os_kv.c @@ -527,12 +527,25 @@ static int kvvfsEncode(const char *aData, int nData, char *aOut){ return j; } -/* Convert hex to binary */ -static char kvvfsHexToBinary(char c){ - if( c>='0' && c<='9' ) return c - '0'; - if( c>='A' && c<='F' ) return c - 'A' + 10; - return 0; -} +static const signed char kvvfsHexValue[256] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 +}; /* ** Decode the text encoding back to binary. The binary content is @@ -540,28 +553,35 @@ static char kvvfsHexToBinary(char c){ ** ** The return value is the number of bytes actually written into aOut[]. */ -static int kvvfsDecode(const char *aIn, char *aOut, int nOut){ +static int kvvfsDecode(const char *a, char *aOut, int nOut){ int i, j; int c; + const unsigned char *aIn = (const unsigned char*)a; i = 0; j = 0; - while( (c = aIn[i])!=0 ){ - if( c>='a' ){ + while( 1 ){ + c = kvvfsHexValue[aIn[i]]; + if( c<0 ){ int n = 0; int mult = 1; + c = aIn[i]; + if( c==0 ) break; while( c>='a' && c<='z' ){ n += (c - 'a')*mult; mult *= 26; c = aIn[++i]; } if( j+n>nOut ) return -1; - while( n-->0 ){ - aOut[j++] = 0; - } + memset(&aOut[j], 0, n); + j += n; + c = aIn[i]; + if( c==0 ) break; }else{ - if( j>nOut ) return -1; - aOut[j] = kvvfsHexToBinary(aIn[i++])<<4; - aOut[j++] += kvvfsHexToBinary(aIn[i++]); + aOut[j] = c<<4; + c = kvvfsHexValue[aIn[++i]]; + if( c<0 ) break; + aOut[j++] += c; + i++; } } return j; @@ -1021,7 +1041,10 @@ static int kvvfsFullPathname( int nOut, char *zOut ){ - size_t nPath = strlen(zPath); + size_t nPath; + +zPath = "local"; + nPath = strlen(zPath); SQLITE_KV_LOG(("xFullPathname(\"%s\")\n", zPath)); if( nOut<nPath+1 ) nPath = nOut - 1; memcpy(zOut, zPath, nPath); |