Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* The RTF parser only accepted lower case hex numbers which prevented the

Browse Source 
prices.rtf to be parsed correctly as reported by humdinger.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36884 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-05-21 11:39:19 +00:00
parent db90422897
commit b70311a396
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/add-ons/translators/rtf/RTF.cpp
View File

@ -1,17 +1,25 @@
/* /*
* Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Copyright 2004-2010, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#include "RTF.h" #include "RTF.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <DataIO.h> #include <DataIO.h>
#include <stdlib.h>
#include <stdio.h> //#define TRACE_RTF
#include <string.h> #ifdef TRACE_RTF
#include <ctype.h> # define TRACE(x...) printf(x)
#else
# define TRACE(x...) ;
#endif
static const char *kDestinationControlWords[] = { static const char *kDestinationControlWords[] = {
@ -37,7 +45,7 @@ read_char(BDataIO &stream, bool endOfFileAllowed) throw (status_t)
{ {
char c; char c;
ssize_t bytesRead = stream.Read(&c, 1); ssize_t bytesRead = stream.Read(&c, 1);
if (bytesRead < B_OK) if (bytesRead < B_OK)
throw (status_t)bytesRead; throw (status_t)bytesRead;
@ -49,7 +57,8 @@ read_char(BDataIO &stream, bool endOfFileAllowed) throw (status_t)
static int32 static int32
parse_integer(char first, BDataIO &stream, char &_last, int32 base) throw (status_t) parse_integer(char first, BDataIO &stream, char &_last, int32 base)
throw (status_t)
{ {
const char *kDigits = "0123456789abcdef"; const char *kDigits = "0123456789abcdef";
int32 integer = 0; int32 integer = 0;
@ -63,7 +72,7 @@ parse_integer(char first, BDataIO &stream, char &_last, int32 base) throw (statu
while (true) { while (true) {
int32 pos = 0; int32 pos = 0;
for (; pos < base; pos++) { for (; pos < base; pos++) {
if (kDigits[pos] == digit) { if (kDigits[pos] == tolower(digit)) {
integer = integer * base + pos; integer = integer * base + pos;
count++; count++;
break; break;
@ -478,7 +487,7 @@ Header::Charset() const
} }
rgb_color rgb_color
Header::Color(int32 index) Header::Color(int32 index)
{ {
rgb_color color = {0, 0, 0, 255}; rgb_color color = {0, 0, 0, 255};
@ -634,6 +643,8 @@ Command::Parse(char first, BDataIO &stream, char &last) throw (status_t)
} else } else
fName.SetTo(name, length); fName.SetTo(name, length);
TRACE("command: %s\n", fName.String());
// parse numeric option // parse numeric option
if (c == '-') if (c == '-')
@ -654,11 +665,14 @@ Command::Parse(char first, BDataIO &stream, char &last) throw (status_t)
// decimal // decimal
if (isdigit(c)) if (isdigit(c))
SetOption(parse_integer(c, stream, last)); SetOption(parse_integer(c, stream, last));
// a space delimiter is eaten up by the command // a space delimiter is eaten up by the command
if (isspace(last)) if (isspace(last))
last = read_char(stream); last = read_char(stream);
} }
if (HasOption())
TRACE(" option: %ld\n", fOption);
} }