aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-07-26 12:11:32 +0000
committerEric Andersen <andersen@codepoet.org>2004-07-26 12:11:32 +0000
commitb2a300590d1e061658be5aa4f74a437485b36a55 (patch)
tree9d4745b7528d677e7dc5979c0592a8253fb3908b /libbb
parent8f38782a6e797c4b5c322e0b6a4ec6d369822c6a (diff)
downloadbusybox-b2a300590d1e061658be5aa4f74a437485b36a55.tar.gz
bother. unrevert my fix.
Diffstat (limited to 'libbb')
-rw-r--r--libbb/process_escape_sequence.c39
1 files changed, 23 insertions, 16 deletions
diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index f5ac500fa..e6b5fc995 100644
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -22,35 +22,42 @@
*
*/
+#include <string.h>
#include <stdio.h>
#include <limits.h>
+#include <ctype.h>
#include "libbb.h"
+#define isodigit(c) ((c) >= '0' && (c) <= '7')
+#define hextobin(c) ((c)>='a'&&(c)<='f' ? (c)-'a'+10 : (c)>='A'&&(c)<='F' ? (c)-'A'+10 : (c)-'0')
+#define octtobin(c) ((c) - '0')
char bb_process_escape_sequence(const char **ptr)
{
+ const char *p, *q;
+ unsigned int num_digits, r, n, hexescape;
static const char charmap[] = {
'a', 'b', 'f', 'n', 'r', 't', 'v', '\\', 0,
'\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
- const char *p;
- const char *q;
- unsigned int num_digits;
- unsigned int r;
- unsigned int n;
-
- n = 0;
+ n = r = hexescape = num_digits = 0;
q = *ptr;
- num_digits = 0;
+ if (*q == 'x') {
+ hexescape++;
+ ++q;
+ }
+
do {
- if (((unsigned int)(*q - '0')) <= 7) {
- r = n * 8 + (*q - '0');
- if (r <= UCHAR_MAX) {
- n = r;
- ++q;
- if (++num_digits < 3) {
- continue;
- }
+ if (hexescape && isxdigit(*q)) {
+ r = n * 16 + hextobin(*q);
+ } else if (isodigit(*q)) {
+ r = n * 8 + octtobin(*q);
+ }
+ if (r <= UCHAR_MAX) {
+ n = r;
+ ++q;
+ if (++num_digits < 3) {
+ continue;
}
}
break;