/[public]/psiconv/trunk/lib/psiconv/parse_simple.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_simple.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 168 Revision 184
… …
23#include <stdlib.h> 23#include <stdlib.h>
24#include <math.h> 24#include <math.h>
25 25
26#include "parse_routines.h" 26#include "parse_routines.h"
27#include "error.h" 27#include "error.h"
28#include "unicode.h"
28 29
29#ifdef DMALLOC 30#ifdef DMALLOC
30#include <dmalloc.h> 31#include <dmalloc.h>
31#endif 32#endif
32 33
34static psiconv_float_t pow2(int n);
35static psiconv_string_t psiconv_read_string_aux(const psiconv_config config,
36 const psiconv_buffer buf,int lev,
37 psiconv_u32 off,int *length, int *status,
38 int kind);
39
33/* Very inefficient, but good enough for now. By implementing it ourselves, 40/* Very inefficient, but good enough for now. By implementing it ourselves,
34 we do not have to link with -lm */ 41 we do not have to link with -lm */
35psiconv_float_t pow2(int n) 42psiconv_float_t pow2(int n)
36{ 43{
37 psiconv_float_t res=1.0; 44 psiconv_float_t res=1.0;
… …
46 int *status) 53 int *status)
47{ 54{
48 psiconv_u8 *ptr; 55 psiconv_u8 *ptr;
49 ptr = psiconv_buffer_get(buf,off); 56 ptr = psiconv_buffer_get(buf,off);
50 if (!ptr) { 57 if (!ptr) {
51 psiconv_warn(config,lev,off,"Trying byte read past the end of the file"); 58 psiconv_error(config,lev,off,"Trying byte read past the end of the file");
52 if (status) 59 if (status)
53 *status = -PSICONV_E_PARSE; 60 *status = -PSICONV_E_PARSE;
54 return 0; 61 return 0;
55 } 62 }
56 if (status) 63 if (status)
… …
63{ 70{
64 psiconv_u8 *ptr0,*ptr1; 71 psiconv_u8 *ptr0,*ptr1;
65 ptr0 = psiconv_buffer_get(buf,off); 72 ptr0 = psiconv_buffer_get(buf,off);
66 ptr1 = psiconv_buffer_get(buf,off+1); 73 ptr1 = psiconv_buffer_get(buf,off+1);
67 if (!ptr0 || !ptr1) { 74 if (!ptr0 || !ptr1) {
68 psiconv_warn(config,lev,off,"Trying word read past the end of the file"); 75 psiconv_error(config,lev,off,"Trying word read past the end of the file");
69 if (status) 76 if (status)
70 *status = -PSICONV_E_PARSE; 77 *status = -PSICONV_E_PARSE;
71 return 0; 78 return 0;
72 } 79 }
73 if (status) 80 if (status)
… …
82 ptr0 = psiconv_buffer_get(buf,off); 89 ptr0 = psiconv_buffer_get(buf,off);
83 ptr1 = psiconv_buffer_get(buf,off+1); 90 ptr1 = psiconv_buffer_get(buf,off+1);
84 ptr2 = psiconv_buffer_get(buf,off+2); 91 ptr2 = psiconv_buffer_get(buf,off+2);
85 ptr3 = psiconv_buffer_get(buf,off+3); 92 ptr3 = psiconv_buffer_get(buf,off+3);
86 if (!ptr0 || !ptr1 || !ptr2 || !ptr3) { 93 if (!ptr0 || !ptr1 || !ptr2 || !ptr3) {
87 psiconv_warn(config,lev,off,"Trying long read past the end of the file"); 94 psiconv_error(config,lev,off,"Trying long read past the end of the file");
88 if (status) 95 if (status)
89 *status = -PSICONV_E_PARSE; 96 *status = -PSICONV_E_PARSE;
90 return 0; 97 return 0;
91 } 98 }
92 if (status) 99 if (status)
… …
131 if (localstatus) 138 if (localstatus)
132 goto ERROR; 139 goto ERROR;
133 len = 2; 140 len = 2;
134 psiconv_debug(config,lev+2,off,"Indicator (2 bytes): %04x",res); 141 psiconv_debug(config,lev+2,off,"Indicator (2 bytes): %04x",res);
135 } else { 142 } else {
136 psiconv_warn(config,lev+2,off,"S indicator: unknown encoding!"); 143 psiconv_error(config,lev+2,off,"S indicator: unknown encoding!");
137 psiconv_debug(config,lev+2,off,"Raw data first byte: %02x",temp); 144 psiconv_debug(config,lev+2,off,"Raw data first byte: %02x",temp);
138 goto ERROR; 145 goto ERROR;
139 } 146 }
140 147
141 if (length) 148 if (length)
… …
147 "End of S length indicator (total length: %08x)", len); 154 "End of S length indicator (total length: %08x)", len);
148 155
149 return res; 156 return res;
150 157
151ERROR: 158ERROR:
152 psiconv_warn(config,lev+1,off,"Reading of S indicator failed"); 159 psiconv_error(config,lev+1,off,"Reading of S indicator failed");
153 if (status) 160 if (status)
154 *status = localstatus; 161 *status = localstatus;
155 if (length) 162 if (length)
156 *length = 0; 163 *length = 0;
157 return 0; 164 return 0;
… …
185 if (localstatus) 192 if (localstatus)
186 goto ERROR; 193 goto ERROR;
187 len = 4; 194 len = 4;
188 psiconv_debug(config,lev+2,off,"Indicator (4 bytes): %08x",res); 195 psiconv_debug(config,lev+2,off,"Indicator (4 bytes): %08x",res);
189 } else { 196 } else {
190 psiconv_warn(config,lev+2,off,"X indicator: unknown encoding!"); 197 psiconv_error(config,lev+2,off,"X indicator: unknown encoding!");
191 psiconv_debug(config,lev+2,off,"Raw data first byte: %02x",temp); 198 psiconv_debug(config,lev+2,off,"Raw data first byte: %02x",temp);
192 goto ERROR; 199 goto ERROR;
193 } 200 }
194 201
195 if (length) 202 if (length)
… …
201 "End of X length indicator (total length: %08x)", len); 208 "End of X length indicator (total length: %08x)", len);
202 209
203 return res; 210 return res;
204 211
205ERROR: 212ERROR:
206 psiconv_warn(config,lev+1,off,"Reading of X indicator failed"); 213 psiconv_error(config,lev+1,off,"Reading of X indicator failed");
207 if (status) 214 if (status)
208 *status = localstatus; 215 *status = localstatus;
209 if (length) 216 if (length)
210 *length = 0; 217 *length = 0;
211 return 0; 218 return 0;
… …
218 int localstatus; 225 int localstatus;
219 226
220 res = (2.54/1440.0) * ((psiconv_s32) psiconv_read_u32(config,buf,lev,off, 227 res = (2.54/1440.0) * ((psiconv_s32) psiconv_read_u32(config,buf,lev,off,
221 &localstatus)); 228 &localstatus));
222 if (localstatus) { 229 if (localstatus) {
223 psiconv_warn(config,lev+1,off,"Reading of length failed"); 230 psiconv_error(config,lev+1,off,"Reading of length failed");
224 if (length) 231 if (length)
225 *length = 0; 232 *length = 0;
226 if (status) 233 if (status)
227 *status = localstatus; 234 *status = localstatus;
228 return 0; 235 return 0;
… …
240{ 247{
241 psiconv_size_t res; 248 psiconv_size_t res;
242 int localstatus; 249 int localstatus;
243 res = ((psiconv_s32) psiconv_read_u32(config,buf,lev,off,&localstatus)) / 20.0; 250 res = ((psiconv_s32) psiconv_read_u32(config,buf,lev,off,&localstatus)) / 20.0;
244 if (localstatus) { 251 if (localstatus) {
245 psiconv_warn(config,lev+1,off,"Reading of size failed"); 252 psiconv_error(config,lev+1,off,"Reading of size failed");
246 if (length) 253 if (length)
247 *length = 0; 254 *length = 0;
248 if (status) 255 if (status)
249 *status = localstatus; 256 *status = localstatus;
250 return 0; 257 return 0;
… …
262{ 269{
263 psiconv_u8 temp; 270 psiconv_u8 temp;
264 int localstatus; 271 int localstatus;
265 temp = psiconv_read_u8(config,buf,lev,off,&localstatus); 272 temp = psiconv_read_u8(config,buf,lev,off,&localstatus);
266 if (localstatus) { 273 if (localstatus) {
267 psiconv_warn(config,lev+1,off,"Reading of bool failed"); 274 psiconv_error(config,lev+1,off,"Reading of bool failed");
268 if (length) 275 if (length)
269 *length = 0; 276 *length = 0;
270 return localstatus; 277 return localstatus;
271 } 278 }
272 if (length) 279 if (length)
… …
282 psiconv_debug(config,lev+1,off,"Boolean value: %02x",temp); 289 psiconv_debug(config,lev+1,off,"Boolean value: %02x",temp);
283 *result = psiconv_bool_true; 290 *result = psiconv_bool_true;
284 return 0; 291 return 0;
285} 292}
286 293
287psiconv_string_t psiconv_read_string(const psiconv_config config,const psiconv_buffer buf,int lev, 294psiconv_string_t psiconv_read_string(const psiconv_config config,
295 const psiconv_buffer buf,int lev,
288 psiconv_u32 off,int *length, int *status) 296 psiconv_u32 off,int *length, int *status)
297{
298 return psiconv_read_string_aux(config,buf,lev,off,length,status,-1);
299}
300
301psiconv_string_t psiconv_read_short_string(const psiconv_config config,
302 const psiconv_buffer buf,int lev,
303 psiconv_u32 off,int *length, int *status)
304{
305 return psiconv_read_string_aux(config,buf,lev,off,length,status,-2);
306}
307
308psiconv_string_t psiconv_read_charlist(const psiconv_config config,
309 const psiconv_buffer buf, int lev,
310 psiconv_u32 off, int nrofchars,
311 int *status)
312{
313 int length;
314 if (nrofchars <= 0) {
315 psiconv_error(config,lev,off,
316 "psiconv_read_charlist called with non-positive nrofchars");
317 if (status)
318 *status = -PSICONV_E_OTHER;
319 return NULL;
320 }
321 return psiconv_read_string_aux(config,buf,lev,off,&length,status,nrofchars);
322}
323
324
325psiconv_string_t psiconv_read_string_aux(const psiconv_config config,
326 const psiconv_buffer buf,int lev,
327 psiconv_u32 off,int *length, int *status,
328 int kind)
289{ 329{
290 int stringlen,i,leng,len,localstatus; 330 int stringlen,i,leng,len,localstatus;
291 psiconv_string_t result; 331 psiconv_string_t result;
292 char *res_copy; 332 char *res_copy;
333 psiconv_u8 temp;
293 334
294 psiconv_progress(config,lev+1,off,"Going to read a string"); 335 psiconv_progress(config,lev+1,off,"Going to read a string");
295 336
337 if (kind == -1)
296 stringlen = psiconv_read_S(config,buf,lev+2,off,&leng,&localstatus); 338 stringlen = psiconv_read_S(config,buf,lev+2,off,&leng,&localstatus);
339 else if (kind == -2) {
340 stringlen = psiconv_read_u8(config,buf,lev+2,off,&localstatus);
341 leng = 1;
342 } else {
343 stringlen = kind;
344 leng = 0;
345 localstatus = 0;
346 }
297 if (localstatus) 347 if (localstatus)
298 goto ERROR1; 348 goto ERROR1;
299 psiconv_debug(config,lev+2,off,"Length: %i",stringlen); 349 psiconv_debug(config,lev+2,off,"Length: %i",stringlen);
300 len = leng; 350 len = leng;
301 351
302 result = malloc(stringlen + 1); 352 result = malloc(sizeof(*result) * (stringlen + 1));
303 if (!result) 353 if (!result)
304 goto ERROR1; 354 goto ERROR1;
305 for (i = 0; (i < stringlen) && !localstatus; i++) 355 for (i = 0; i < stringlen; i++) {
306 result[i] = psiconv_read_u8(config,buf,lev,off+i+len,&localstatus); 356 temp = psiconv_read_u8(config,buf,lev,off+i+len,&localstatus);
307 if (localstatus) 357 if (localstatus)
308 goto ERROR2; 358 goto ERROR2;
359 result[i] = psiconv_unicode_from_char(config,temp);
360 }
309 result[stringlen] = 0; 361 result[stringlen] = 0;
310 len += stringlen; 362 len += stringlen;
311 363
312 res_copy = psiconv_make_printable(result); 364 res_copy = psiconv_make_printable(config,result);
313 if (!res_copy) 365 if (!res_copy)
314 goto ERROR2; 366 goto ERROR2;
315 psiconv_debug(config,lev+2,off,"Contents: `%s'",res_copy); 367 psiconv_debug(config,lev+2,off,"Contents: `%s'",res_copy);
316 free(res_copy); 368 free(res_copy);
317 369
… …
326 return result; 378 return result;
327 379
328ERROR2: 380ERROR2:
329 free(result); 381 free(result);
330ERROR1: 382ERROR1:
331 psiconv_warn(config,lev+1,off,"Reading of string failed"); 383 psiconv_error(config,lev+1,off,"Reading of string failed");
332 if (status)
333 *status = localstatus;
334 if (length)
335 *length = 0;
336 return NULL;
337}
338
339psiconv_string_t psiconv_read_short_string(const psiconv_config config, const psiconv_buffer buf,
340 int lev,
341 psiconv_u32 off,int *length, int *status)
342{
343 int stringlen,i,len,localstatus;
344 psiconv_string_t result;
345 char *res_copy;
346
347 psiconv_progress(config,lev+1,off,"Going to read a short string");
348
349 stringlen = psiconv_read_u8(config,buf,lev+2,off,&localstatus);
350 if (localstatus)
351 goto ERROR1;
352 psiconv_debug(config,lev+2,off,"Length: %i",stringlen);
353 len = 1;
354
355 result = malloc(stringlen + 1);
356 if (!result)
357 goto ERROR1;
358 for (i = 0; (i < stringlen) && !localstatus; i++)
359 result[i] = psiconv_read_u8(config,buf,lev,off+i+len,&localstatus);
360 if (localstatus)
361 goto ERROR2;
362 result[stringlen] = 0;
363 len += stringlen;
364
365 res_copy = psiconv_make_printable(result);
366 if (!res_copy)
367 goto ERROR2;
368 psiconv_debug(config,lev+2,off,"Contents: `%s'",res_copy);
369 free(res_copy);
370
371 if (length)
372 *length = len;
373
374 if (status)
375 *status = 0;
376
377 psiconv_progress(config,lev+1,off+len-1,"End of short string (total length: %08x)",
378 len);
379
380 return result;
381
382
383ERROR2:
384 free(result);
385ERROR1:
386 psiconv_warn(config,lev+1,off,"Reading of short string failed");
387 if (status) 384 if (status)
388 *status = localstatus; 385 *status = localstatus;
389 if (length) 386 if (length)
390 *length = 0; 387 *length = 0;
391 return NULL; 388 return NULL;
… …
423 *length = 8; 420 *length = 8;
424 if (*status) 421 if (*status)
425 *status = res; 422 *status = res;
426 return result; 423 return result;
427ERROR: 424ERROR:
428 psiconv_warn(config,lev+1,off,"Reading of float failed"); 425 psiconv_error(config,lev+1,off,"Reading of float failed");
429 if (length) 426 if (length)
430 *length = 0; 427 *length = 0;
431 if (*status) 428 if (*status)
432 *status = res; 429 *status = res;
433 return 0.0; 430 return 0.0;
Legend:
Removed from v.168  
changed lines
  Added in v.184
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26