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

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

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

Revision 108 Revision 129
… …
286 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 286 {psiconv_formula_unknown,0,"*UNKNOWN*"},
287 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 287 {psiconv_formula_unknown,0,"*UNKNOWN*"},
288 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 288 {psiconv_formula_unknown,0,"*UNKNOWN*"},
289 {psiconv_formula_unknown,0,"*UNKNOWN*"}}; 289 {psiconv_formula_unknown,0,"*UNKNOWN*"}};
290 290
291static psiconv_string_t psiconv_read_sheet_string(const psiconv_buffer buf,
292 int lev,
293 psiconv_u32 off,int *length, int *status)
294{
295 int stringlen,i,len,localstatus;
296 psiconv_string_t result;
297 char *res_copy;
298
299 psiconv_progress(lev+1,off,"Going to read a sheet string");
300
301 stringlen = psiconv_read_u8(buf,lev+2,off,&localstatus);
302 if (localstatus)
303 goto ERROR1;
304 psiconv_debug(lev+2,off,"Length: %i",stringlen);
305 len = 1;
306
307 result = malloc(stringlen + 1);
308 if (!result)
309 goto ERROR1;
310 for (i = 0; (i < stringlen) && !localstatus; i++)
311 result[i] = psiconv_read_u8(buf,lev,off+i+len,&localstatus);
312 if (localstatus)
313 goto ERROR2;
314 result[stringlen] = 0;
315 len += stringlen;
316
317 res_copy = psiconv_make_printable(result);
318 if (!res_copy)
319 goto ERROR2;
320 psiconv_debug(lev+2,off,"Contents: `%s'",res_copy);
321 free(res_copy);
322
323 if (length)
324 *length = len;
325
326 if (status)
327 *status = 0;
328
329 psiconv_progress(lev+1,off+len-1,"End of sheet string (total length: %08x)",
330 len);
331
332 return result;
333
334
335ERROR2:
336 free(result);
337ERROR1:
338 psiconv_warn(lev+1,off,"Reading of sheet string failed");
339 if (status)
340 *status = localstatus;
341 if (length)
342 *length = 0;
343 return NULL;
344}
345
346
347static int psiconv_parse_sheet_ref(const psiconv_buffer buf,int lev, 291static int psiconv_parse_sheet_ref(const psiconv_buffer buf,int lev,
348 psiconv_u32 off, int *length, 292 psiconv_u32 off, int *length,
349 psiconv_sheet_ref_t *result) 293 psiconv_sheet_ref_t *result)
350{ 294{
351 int res; 295 int res;
… …
444{ 388{
445 int res=0; 389 int res=0;
446 int len=0; 390 int len=0;
447 int leng; 391 int leng;
448 int eof = 0; 392 int eof = 0;
449 psiconv_u8 marker,submarker; 393 psiconv_u8 marker,submarker,submarker2;
450 psiconv_formula_list formula_stack; 394 psiconv_formula_list formula_stack;
451 psiconv_formula formula,subformula,subformula1,subformula2, 395 psiconv_formula formula,subformula,subformula1,subformula2,
452 subformula3,subformula4; 396 subformula3,subformula4;
453 psiconv_u16 temp,nr_of_subs; 397 psiconv_u16 temp,nr_of_subs;
454 398
… …
546 formula->type = psiconv_formula_unknown; 490 formula->type = psiconv_formula_unknown;
547 } else if (formula_elements[marker].formula_type == 491 } else if (formula_elements[marker].formula_type ==
548 psiconv_formula_dat_string) { 492 psiconv_formula_dat_string) {
549 psiconv_progress(lev+3,off+len,"Next item: a string"); 493 psiconv_progress(lev+3,off+len,"Next item: a string");
550 formula->data.dat_string = 494 formula->data.dat_string =
551 psiconv_read_sheet_string(buf,lev+2,off+len,&leng,&res); 495 psiconv_read_short_string(buf,lev+2,off+len,&leng,&res);
552 if (res) 496 if (res)
553 goto ERROR8; 497 goto ERROR8;
554 formula->type = formula_elements[marker].formula_type; 498 formula->type = formula_elements[marker].formula_type;
555 len += leng; 499 len += leng;
556 if ((res = psiconv_list_add(formula_stack,formula))) 500 if ((res = psiconv_list_add(formula_stack,formula)))
557 goto ERROR8; 501 goto ERROR8;
558 formula->type = psiconv_formula_unknown; 502 formula->type = psiconv_formula_unknown;
559 } else if ((formula_elements[marker].formula_type == 503 } else if ((formula_elements[marker].formula_type ==
560 psiconv_formula_dat_var) || 504 psiconv_formula_dat_var)) {
561 (formula_elements[marker].formula_type == 505 psiconv_progress(lev+3,off+len,"Next item: a variable reference");
562 psiconv_formula_dat_vcellblock)) { 506 formula->data.dat_variable = psiconv_read_u32(buf,lev+2,off+len,&res);
563 psiconv_warn(lev+3,off+len,"Not yet supported formula mark!"); 507 if (res)
564 goto ERROR8; 508 goto ERROR8;
509 formula->type = formula_elements[marker].formula_type;
510 len += 4;
511 if ((res = psiconv_list_add(formula_stack,formula)))
512 goto ERROR8;
513 formula->type = psiconv_formula_unknown;
565 } else if (formula_elements[marker].number_of_args == -1) { 514 } else if (formula_elements[marker].number_of_args == -1) {
566 psiconv_progress(lev+3,off+len,"Going to parse a vararg function"); 515 psiconv_progress(lev+3,off+len,"Going to parse a vararg function");
567 if (!(formula->data.fun_operands = 516 if (!(formula->data.fun_operands =
568 psiconv_list_new(sizeof(*formula)))) 517 psiconv_list_new(sizeof(*formula))))
569 goto ERROR8; 518 goto ERROR8;
… …
585 psiconv_progress(lev+4,off+len,"Going to read the next marker"); 534 psiconv_progress(lev+4,off+len,"Going to read the next marker");
586 submarker = psiconv_read_u8(buf,lev+4,off+len,&res); 535 submarker = psiconv_read_u8(buf,lev+4,off+len,&res);
587 len ++; 536 len ++;
588 if (res) 537 if (res)
589 goto ERROR8; 538 goto ERROR8;
539 submarker2 = psiconv_read_u8(buf,lev+4,off+len,&res);
540 if (res)
541 goto ERROR8;
590 } while (formula_elements[submarker].formula_type 542 } while ((formula_elements[submarker].formula_type
591 == psiconv_formula_mark_opsep); 543 == psiconv_formula_mark_opsep) &&
544 (formula_elements[submarker2].formula_type
545 != psiconv_formula_mark_opend));
546 if ((formula_elements[submarker].formula_type ==
547 psiconv_formula_mark_opsep) &&
548 (formula_elements[submarker2].formula_type ==
549 psiconv_formula_mark_opend)) {
550 submarker=submarker2;
551 len++;
552 }
592 if (formula_elements[submarker].formula_type 553 if (formula_elements[submarker].formula_type
593 != psiconv_formula_mark_opend) { 554 != psiconv_formula_mark_opend) {
594 psiconv_warn(lev+3,off+len,"Formula corrupted!"); 555 psiconv_warn(lev+3,off+len,"Formula corrupted!");
595 psiconv_debug(lev+3,off+len,"Found unexpected marker %02x",submarker); 556 psiconv_debug(lev+3,off+len,"Found unexpected marker %02x",submarker);
596 goto ERROR8; 557 goto ERROR8;
Legend:
Removed from v.108  
changed lines
  Added in v.129
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26