Clean up hex escape support.

This commit is contained in:
Manuel Novoa III 2004-07-29 23:15:16 +00:00
parent 27645b4345
commit 413db4d583

View File

@ -22,48 +22,69 @@
* *
*/ */
#include <string.h>
#include <stdio.h> #include <stdio.h>
#include <limits.h> #include <limits.h>
#include <ctype.h> #include <ctype.h>
#include "libbb.h" #include "libbb.h"
#define isodigit(c) ((c) >= '0' && (c) <= '7') #define WANT_HEX_ESCAPES 1
#define hextobin(c) ((c)>='a'&&(c)<='f' ? (c)-'a'+10 : (c)>='A'&&(c)<='F' ? (c)-'A'+10 : (c)-'0')
#define octtobin(c) ((c) - '0') /* Usual "this only works for ascii compatible encodings" disclaimer. */
#undef _tolower
#define _tolower(X) ((X)|((char) 0x20))
char bb_process_escape_sequence(const char **ptr) char bb_process_escape_sequence(const char **ptr)
{ {
const char *p, *q;
unsigned int num_digits, r, n, hexescape;
static const char charmap[] = { static const char charmap[] = {
'a', 'b', 'f', 'n', 'r', 't', 'v', '\\', 0, 'a', 'b', 'f', 'n', 'r', 't', 'v', '\\', 0,
'\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' }; '\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
n = r = hexescape = num_digits = 0; const char *p;
const char *q;
unsigned int num_digits;
unsigned int r;
unsigned int n;
unsigned int d;
unsigned int base;
num_digits = n = 0;
base = 8;
q = *ptr; q = *ptr;
#ifdef WANT_HEX_ESCAPES
if (*q == 'x') { if (*q == 'x') {
hexescape++;
++q; ++q;
base = 16;
++num_digits;
} }
#endif
do { do {
if (hexescape && isxdigit(*q)) { d = (unsigned int)(*q - '0');
r = n * 16 + hextobin(*q); #ifdef WANT_HEX_ESCAPES
} else if (isodigit(*q)) { if (d >= 10) {
r = n * 8 + octtobin(*q); d = ((unsigned int)(_tolower(*q) - 'a')) + 10;
} else { }
#endif
if (d >= base) {
#ifdef WANT_HEX_ESCAPES
if ((base == 16) && (!--num_digits)) {
/* return '\\'; */
--q;
}
#endif
break; break;
} }
if (r <= UCHAR_MAX) {
n = r; r = n * base + d;
++q; if (r > UCHAR_MAX) {
if (++num_digits < 3) { break;
continue;
}
} }
break;
} while (1); n = r;
++q;
} while (++num_digits < 3);
if (num_digits == 0) { /* mnemonic escape sequence? */ if (num_digits == 0) { /* mnemonic escape sequence? */
p = charmap; p = charmap;
@ -77,6 +98,7 @@ char bb_process_escape_sequence(const char **ptr)
} }
*ptr = q; *ptr = q;
return (char) n; return (char) n;
} }