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

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

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

Revision 41 Revision 170
1/* 1/*
2 parse_driver.c - Part of psiconv, a PSION 5 file formats converter 2 parse_driver.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/ 18*/
19 19
20#include "config.h" 20#include "config.h"
21#include "compat.h"
22
21#include <stdlib.h> 23#include <stdlib.h>
24#include <string.h>
22 25
23#include "parse.h" 26#include "parse.h"
24#include "parse_routines.h" 27#include "parse_routines.h"
25#include "data.h"
26 28
27psiconv_file_type_t psiconv_file_type(psiconv_buffer buf,int *length, 29#ifdef DMALLOC
30#include <dmalloc.h>
31#endif
32
33
34psiconv_file_type_t psiconv_file_type(const psiconv_config config,
35 psiconv_buffer buf,int *length,
28 psiconv_header_section *result) 36 psiconv_header_section *result)
29{ 37{
30 psiconv_header_section header; 38 psiconv_header_section header;
31 psiconv_file_type_t res; 39 psiconv_file_type_t res;
32 int leng; 40 int leng;
33 41
34 psiconv_parse_header_section(buf,0,0,&leng,&header); 42 if ((psiconv_parse_header_section(config,buf,0,0,&leng,&header)))
43 return psiconv_unknown_file;
35 res = header->file; 44 res = header->file;
36 if (result) 45 if (result)
37 *result = header; 46 *result = header;
38 else 47 else
39 psiconv_free_header_section(header); 48 psiconv_free_header_section(header);
40 if (length) 49 if (length)
41 *length = leng; 50 *length = leng;
42 return res; 51 return res;
43} 52}
44 53
45int psiconv_parse(const psiconv_buffer buf,psiconv_file *result) 54int psiconv_parse(const psiconv_config config,const psiconv_buffer buf,
55 psiconv_file *result)
46{ 56{
47 int res=0; 57 int res=0;
48 int lev=0; 58 int lev=0;
49 int off=0; 59 int off=0;
50 int leng; 60 int leng;
51 61
52 (*result) = malloc(sizeof(**result)); 62 if (!((*result) = malloc(sizeof(**result))))
63 goto ERROR1;
53 64
54 (*result)->type = psiconv_file_type(buf,&leng,NULL); 65 (*result)->type = psiconv_file_type(config,buf,&leng,NULL);
55 if ((*result)->type == psiconv_unknown_file) { 66 if ((*result)->type == psiconv_unknown_file) {
56 psiconv_warn(lev+1,off,"Unknown file type: can't parse!"); 67 psiconv_warn(config,lev+1,off,"Unknown file type: can't parse!");
57 (*result)->file = NULL; 68 (*result)->file = NULL;
58 res = -1;
59 } else if ((*result)->type == psiconv_word_file) 69 } else if ((*result)->type == psiconv_word_file)
60 res = psiconv_parse_word_file(buf,lev+2,leng, 70 res = psiconv_parse_word_file(config,buf,lev+2,leng,
61 (psiconv_word_f *)(&((*result)->file))); 71 (psiconv_word_f *)(&((*result)->file)));
62 else if ((*result)->type == psiconv_texted_file) 72 else if ((*result)->type == psiconv_texted_file)
63 res = psiconv_parse_texted_file(buf,lev+2,leng, 73 res = psiconv_parse_texted_file(config,buf,lev+2,leng,
64 (psiconv_texted_f *)(&((*result)->file))); 74 (psiconv_texted_f *)(&((*result)->file)));
65 else if ((*result)->type == psiconv_mbm_file) 75 else if ((*result)->type == psiconv_mbm_file)
66 res = psiconv_parse_mbm_file(buf,lev+2,leng, 76 res = psiconv_parse_mbm_file(config,buf,lev+2,leng,
67 (psiconv_mbm_f *)(&((*result)->file))); 77 (psiconv_mbm_f *)(&((*result)->file)));
68 else if ((*result)->type == psiconv_sketch_file) 78 else if ((*result)->type == psiconv_sketch_file)
69 res = psiconv_parse_sketch_file(buf,lev+2,leng, 79 res = psiconv_parse_sketch_file(config,buf,lev+2,leng,
70 (psiconv_sketch_f *)(&((*result)->file))); 80 (psiconv_sketch_f *)(&((*result)->file)));
71 else if ((*result)->type == psiconv_clipart_file) 81 else if ((*result)->type == psiconv_clipart_file)
72 res = psiconv_parse_clipart_file(buf,lev+2,leng, 82 res = psiconv_parse_clipart_file(config,buf,lev+2,leng,
73 (psiconv_clipart_f *)(&((*result)->file))); 83 (psiconv_clipart_f *)(&((*result)->file)));
84 else if ((*result)->type == psiconv_sheet_file)
85 res = psiconv_parse_sheet_file(config,buf,lev+2,leng,
86 (psiconv_sheet_f *)(&((*result)->file)));
74 else { 87 else {
75 psiconv_warn(lev+1,off,"Can't parse this file yet!"); 88 psiconv_warn(config,lev+1,off,"Can't parse this file yet!");
76 (*result)->file = NULL; 89 (*result)->file = NULL;
77 } 90 }
78 res = -1; 91 if (res)
92 goto ERROR2;
93 return 0;
79 94
95ERROR2:
96 free(*result);
97ERROR1:
98 psiconv_warn(config,lev+1,off,"Reading of Psion File failed");
99 if (res == 0)
100 return -PSICONV_E_NOMEM;
101 else
80 return res; 102 return res;
81} 103}
82 104
83int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev, 105int psiconv_parse_clipart_file(const psiconv_config config,
106 const psiconv_buffer buf,int lev,
84 psiconv_u32 off, psiconv_clipart_f *result) 107 psiconv_u32 off, psiconv_clipart_f *result)
85{ 108{
109 int res=0;
110 int i;
111 psiconv_jumptable_section table;
112 psiconv_clipart_section clipart;
113 psiconv_u32 *entry;
114
115 psiconv_progress(config,lev+1,off,"Going to read a clipart file");
86 (*result) = malloc(sizeof(**result)); 116 if (!((*result) = malloc(sizeof(**result))))
117 goto ERROR1;
118
119 psiconv_progress(config,lev+2,off,"Going to read the MBM jumptable");
120 if ((res = psiconv_parse_jumptable_section(config,buf,lev+2,off, NULL,&table)))
121 goto ERROR2;
122
123 psiconv_progress(config,lev+2,off,"Going to read the clipart sections");
124 if (!((*result)->sections = psiconv_list_new(sizeof(*clipart))))
125 goto ERROR3;
126 for (i = 0; i < psiconv_list_length(table); i ++) {
127 if (!(entry = psiconv_list_get(table,i)))
128 goto ERROR4;
129 psiconv_progress(config,lev+3,off,"Going to read clipart section %i",i);
130 if ((res = psiconv_parse_clipart_section(config,buf,lev+3,*entry,NULL,&clipart)))
131 goto ERROR4;
132 if ((res = psiconv_list_add((*result)->sections,clipart)))
133 goto ERROR5;
134 }
135
136 psiconv_free_jumptable_section(table);
137 psiconv_progress(config,lev+1,off,"End of clipart file");
87 return 0; 138 return res;
139ERROR5:
140 psiconv_free_clipart_section(clipart);
141ERROR4:
142 for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
143 if (!(clipart = psiconv_list_get((*result)->sections,i))) {
144 psiconv_warn(config,lev+1,off,"Massive memory corruption");
145 goto ERROR3;
146 }
147 psiconv_free_clipart_section(clipart);
148 }
149 psiconv_list_free((*result)->sections);
150ERROR3:
151 psiconv_free_jumptable_section(table);
152ERROR2:
153 free(*result);
154ERROR1:
155 psiconv_warn(config,lev+1,off,"Reading of Clipart File failed");
156 if (res == 0)
157 return -PSICONV_E_NOMEM;
158 else
159 return res;
88} 160}
89 161
90int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 162int psiconv_parse_mbm_file(const psiconv_config config,
163 const psiconv_buffer buf,int lev, psiconv_u32 off,
91 psiconv_mbm_f *result) 164 psiconv_mbm_f *result)
92{ 165{
93 int res=0; 166 int res=0;
94 int i; 167 int i;
95 psiconv_mbm_jumptable_section table; 168 psiconv_jumptable_section table;
96 psiconv_paint_data_section paint; 169 psiconv_paint_data_section paint;
97 psiconv_u32 *entry; 170 psiconv_u32 *entry;
98 psiconv_u32 sto; 171 psiconv_u32 sto;
99 172
100 psiconv_progress(lev+1,off,"Going to read a mbm file"); 173 psiconv_progress(config,lev+1,off,"Going to read a mbm file");
101 *result = malloc(sizeof(**result)); 174 if (!(*result = malloc(sizeof(**result))))
175 goto ERROR1;
102 176
103 psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable"); 177 psiconv_progress(config,lev+2,off,"Going to read the offset of the MBM jumptable");
104 sto = psiconv_read_u32(buf,lev+2,off); 178 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
179 if (res)
180 goto ERROR2;
105 psiconv_debug(lev+2,off,"Offset: %08x",sto); 181 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
106 182
107 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 183 psiconv_progress(config,lev+2,off,"Going to read the MBM jumptable");
108 res |= psiconv_parse_mbm_jumptable_section(buf,lev+2,sto, NULL,&table); 184 if ((res = psiconv_parse_jumptable_section(config,buf,lev+2,sto, NULL,&table)))
185 goto ERROR2;
109 186
110 psiconv_progress(lev+2,off,"Going to read the picture sections"); 187 psiconv_progress(config,lev+2,off,"Going to read the picture sections");
111 (*result)->sections = psiconv_list_new(sizeof(*paint)); 188 if (!((*result)->sections = psiconv_list_new(sizeof(*paint))))
189 goto ERROR3;
112 for (i = 0; i < psiconv_list_length(table); i ++) { 190 for (i = 0; i < psiconv_list_length(table); i ++) {
113 entry = psiconv_list_get(table,i); 191 if (!(entry = psiconv_list_get(table,i)))
192 goto ERROR4;
114 psiconv_progress(lev+3,off,"Going to read picture section %i",i); 193 psiconv_progress(config,lev+3,off,"Going to read picture section %i",i);
115 psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,&paint); 194 if ((res = psiconv_parse_paint_data_section(config,buf,lev+3,*entry,NULL,
195 0,&paint)))
196 goto ERROR4;
116 psiconv_list_add((*result)->sections,paint); 197 if ((res = psiconv_list_add((*result)->sections,paint)))
198 goto ERROR5;
117 } 199 }
118 200
119 psiconv_free_mbm_jumptable_section(table); 201 psiconv_free_jumptable_section(table);
120 psiconv_progress(lev+1,off,"End of mbm file"); 202 psiconv_progress(config,lev+1,off,"End of mbm file");
203 return 0;
204ERROR5:
205 psiconv_free_paint_data_section(paint);
206ERROR4:
207 for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
208 if (!(paint = psiconv_list_get((*result)->sections,i))) {
209 psiconv_warn(config,lev+1,off,"Massive memory corruption");
210 goto ERROR3;
211 }
212 psiconv_free_paint_data_section(paint);
213 }
214 psiconv_list_free((*result)->sections);
215ERROR3:
216 psiconv_free_jumptable_section(table);
217ERROR2:
218 free(*result);
219ERROR1:
220 psiconv_warn(config,lev+1,off,"Reading of MBM File failed");
221 if (res == 0)
222 return -PSICONV_E_NOMEM;
223 else
121 return res; 224 return res;
122} 225}
123 226
124int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev, 227int psiconv_parse_sketch_file(const psiconv_config config,
228 const psiconv_buffer buf,int lev,
125 psiconv_u32 off, 229 psiconv_u32 off,
126 psiconv_sketch_f *result) 230 psiconv_sketch_f *result)
127{ 231{
128 psiconv_section_table_section table; 232 psiconv_section_table_section table;
129 psiconv_application_id_section appl_id; 233 psiconv_application_id_section appl_id;
… …
133 psiconv_section_table_entry entry; 237 psiconv_section_table_entry entry;
134 int i; 238 int i;
135 int res=0; 239 int res=0;
136 char *temp_str; 240 char *temp_str;
137 241
138 psiconv_progress(lev+1,off,"Going to read a sketch file"); 242 psiconv_progress(config,lev+1,off,"Going to read a sketch file");
139 *result = malloc(sizeof(**result)); 243 if (!(*result = malloc(sizeof(**result))))
244 goto ERROR1;
140 245
141 psiconv_progress(lev+2,off, 246 psiconv_progress(config,lev+2,off,
142 "Going to read the offset of the section table section"); 247 "Going to read the offset of the section table section");
143 sto = psiconv_read_u32(buf,lev+2,off); 248 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
249 if (res)
250 goto ERROR2;
144 psiconv_debug(lev+2,off,"Offset: %08x",sto); 251 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
145 252
146 psiconv_progress(lev+2,sto, "Going to read the section table section"); 253 psiconv_progress(config,lev+2,sto, "Going to read the section table section");
147 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table); 254 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
255 goto ERROR2;
148 256
149 for (i = 0; i < psiconv_list_length(table); i ++) { 257 for (i = 0; i < psiconv_list_length(table); i ++) {
150 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 258 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
151 entry = psiconv_list_get(table,i); 259 if (!(entry = psiconv_list_get(table,i)))
260 goto ERROR3;
152 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 261 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
153 applid_sec = entry->offset; 262 applid_sec = entry->offset;
154 psiconv_debug(lev+3,sto, 263 psiconv_debug(config,lev+3,sto,
155 "Found the Application ID section at %08x",applid_sec); 264 "Found the Application ID section at %08x",applid_sec);
156 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) { 265 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) {
157 sketch_sec = entry->offset; 266 sketch_sec = entry->offset;
158 psiconv_debug(lev+3,sto, 267 psiconv_debug(config,lev+3,sto,
159 "Found the Sketch section at %08x",sketch_sec); 268 "Found the Sketch section at %08x",sketch_sec);
160 } else { 269 } else {
161 psiconv_warn(lev+3,sto, 270 psiconv_warn(config,lev+3,sto,
162 "Found unknown section in the Section Table"); 271 "Found unknown section in the Section Table (ignoring)");
163 psiconv_debug(lev+3,sto, 272 psiconv_debug(config,lev+3,sto,
164 "Section ID %08x, offset %08x",entry->id,entry->offset); 273 "Section ID %08x, offset %08x",entry->id,entry->offset);
165 res = -1;
166 } 274 }
167 } 275 }
168 276
169 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 277 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
170 if (! applid_sec) { 278 if (! applid_sec) {
171 psiconv_warn(lev+2,sto, 279 psiconv_warn(config,lev+2,sto,
172 "Application ID section not found in the section table"); 280 "Application ID section not found in the section table");
173 res = -1; 281 res = -PSICONV_E_PARSE;
282 goto ERROR3;
174 } else { 283 } else {
175 psiconv_debug(lev+2,sto, 284 psiconv_debug(config,lev+2,sto,
176 "Application ID section at offset %08x",applid_sec); 285 "Application ID section at offset %08x",applid_sec);
177 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 286 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
178 &appl_id); 287 &appl_id)))
288 goto ERROR3;
179 } 289 }
180 if ((appl_id->id != PSICONV_ID_SKETCH) || 290 if ((appl_id->id != PSICONV_ID_SKETCH) ||
181 strcmp(appl_id->name,"Paint.app")) { 291 strcmp(appl_id->name,"Paint.app")) {
182 psiconv_warn(lev+2,applid_sec, 292 psiconv_warn(config,lev+2,applid_sec,
183 "Application ID section contains unexpected data"); 293 "Application ID section contains unexpected data");
184 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 294 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
185 PSICONV_ID_SKETCH,appl_id->id); 295 PSICONV_ID_SKETCH,appl_id->id);
186 temp_str = psiconv_make_printable(appl_id->name); 296 if (!(temp_str = psiconv_make_printable(appl_id->name)))
297 goto ERROR4;
187 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 298 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
188 "Paint.app",temp_str); 299 "Paint.app",temp_str);
189 free(temp_str); 300 free(temp_str);
301 res = -PSICONV_E_PARSE;
302 goto ERROR4;
190 } 303 }
191 304
192 psiconv_progress(lev+2,sto, "Looking for the Sketch section"); 305 psiconv_progress(config,lev+2,sto, "Looking for the Sketch section");
193 if (! sketch_sec) { 306 if (! sketch_sec) {
194 psiconv_warn(lev+2,sto, 307 psiconv_warn(config,lev+2,sto,
195 "Sketch section not found in the section table"); 308 "Sketch section not found in the section table");
196 res = -1;
197 } else { 309 } else {
198 psiconv_debug(lev+2,sto, 310 psiconv_debug(config,lev+2,sto,
199 "Sketch section at offset %08x",applid_sec); 311 "Sketch section at offset %08x",applid_sec);
200 res |= psiconv_parse_sketch_section(buf,lev+2,sketch_sec,NULL,0, 312 if ((res = psiconv_parse_sketch_section(config,buf,lev+2,sketch_sec,NULL,
201 &(*result)->sketch_sec); 313 &(*result)->sketch_sec)))
314 goto ERROR4;
202 } 315 }
203 316
204 psiconv_free_application_id_section(appl_id); 317 psiconv_free_application_id_section(appl_id);
205 psiconv_free_section_table_section(table); 318 psiconv_free_section_table_section(table);
206 319
207 psiconv_progress(lev+1,off,"End of word file"); 320 psiconv_progress(config,lev+1,off,"End of sketch file");
208 return res; 321 return res;
322
323ERROR4:
324 psiconv_free_application_id_section(appl_id);
325ERROR3:
326 free(table);
327ERROR2:
328 free(*result);
329ERROR1:
330 psiconv_warn(config,lev+1,off,"Reading of Sketch File failed");
331 if (res == 0)
332 return -PSICONV_E_NOMEM;
333 else
334 return res;
209} 335}
210
211 336
212 337
213int psiconv_parse_texted_file(const psiconv_buffer buf,int lev, 338int psiconv_parse_texted_file(const psiconv_config config,
339 const psiconv_buffer buf,int lev,
214 psiconv_u32 off, 340 psiconv_u32 off,
215 psiconv_texted_f *result) 341 psiconv_texted_f *result)
216{ 342{
217 int res=0; 343 int res=0;
218 psiconv_section_table_section table; 344 psiconv_section_table_section table;
… …
225 psiconv_u32 applid_sec = 0; 351 psiconv_u32 applid_sec = 0;
226 psiconv_u32 sto; 352 psiconv_u32 sto;
227 psiconv_section_table_entry entry; 353 psiconv_section_table_entry entry;
228 int i; 354 int i;
229 355
230 psiconv_progress(lev+1,off,"Going to read a texted file"); 356 psiconv_progress(config,lev+1,off,"Going to read a texted file");
231 *result = malloc(sizeof(**result)); 357 if (!(*result = malloc(sizeof(**result))))
358 goto ERROR1;
232 359
233 psiconv_progress(lev+2,off, 360 psiconv_progress(config,lev+2,off,
234 "Going to read the offset of the section table section"); 361 "Going to read the offset of the section table section");
235 sto = psiconv_read_u32(buf,lev+2,off); 362 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
363 if (res)
364 goto ERROR2;
236 psiconv_debug(lev+2,off,"Offset: %08x",sto); 365 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
237 366
238 psiconv_progress(lev+2,sto, "Going to read the section table section"); 367 psiconv_progress(config,lev+2,sto, "Going to read the section table section");
239 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table); 368 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
369 goto ERROR2;
240 370
241 for (i = 0; i < psiconv_list_length(table); i ++) { 371 for (i = 0; i < psiconv_list_length(table); i ++) {
242 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 372 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
243 entry = psiconv_list_get(table,i); 373 if (!(entry = psiconv_list_get(table,i)))
374 goto ERROR3;
244 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 375 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
245 applid_sec = entry->offset; 376 applid_sec = entry->offset;
246 psiconv_debug(lev+3,sto, 377 psiconv_debug(config,lev+3,sto,
247 "Found the Application ID section at %08x",applid_sec); 378 "Found the Application ID section at %08x",applid_sec);
248 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 379 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
249 page_sec = entry->offset; 380 page_sec = entry->offset;
250 psiconv_debug(lev+3,sto, 381 psiconv_debug(config,lev+3,sto,
251 "Found the Page Layout section at %08x",page_sec); 382 "Found the Page Layout section at %08x",page_sec);
252 } else if (entry->id == PSICONV_ID_TEXTED) { 383 } else if (entry->id == PSICONV_ID_TEXTED) {
253 texted_sec = entry->offset; 384 texted_sec = entry->offset;
254 psiconv_debug(lev+3,sto, 385 psiconv_debug(config,lev+3,sto,
255 "Found the TextEd section at %08x",texted_sec); 386 "Found the TextEd section at %08x",texted_sec);
256 } else { 387 } else {
257 psiconv_warn(lev+3,sto, 388 psiconv_warn(config,lev+3,sto,
258 "Found unknown section in the Section Table"); 389 "Found unknown section in the Section Table (ignoring)");
259 psiconv_debug(lev+3,sto, 390 psiconv_debug(config,lev+3,sto,
260 "Section ID %08x, offset %08x",entry->id,entry->offset); 391 "Section ID %08x, offset %08x",entry->id,entry->offset);
261 res = -1;
262 } 392 }
263 } 393 }
264 394
265 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 395 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
266 if (! applid_sec) { 396 if (! applid_sec) {
267 psiconv_warn(lev+2,sto, 397 psiconv_warn(config,lev+2,sto,
268 "Application ID section not found in the section table"); 398 "Application ID section not found in the section table");
269 res = -1; 399 res = -PSICONV_E_PARSE;
400 goto ERROR3;
270 } else { 401 } else {
271 psiconv_debug(lev+2,sto, 402 psiconv_debug(config,lev+2,sto,
272 "Application ID section at offset %08x",applid_sec); 403 "Application ID section at offset %08x",applid_sec);
273 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 404 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
274 &appl_id); 405 &appl_id)))
406 goto ERROR3;
275 } 407 }
276 if ((appl_id->id != PSICONV_ID_TEXTED) || 408 if ((appl_id->id != PSICONV_ID_TEXTED) ||
277 strcmp(appl_id->name,"TextEd.app")) { 409 strcmp(appl_id->name,"TextEd.app")) {
278 psiconv_warn(lev+2,applid_sec, 410 psiconv_warn(config,lev+2,applid_sec,
279 "Application ID section contains unexpected data"); 411 "Application ID section contains unexpected data");
280 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 412 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
281 PSICONV_ID_TEXTED,appl_id->id); 413 PSICONV_ID_TEXTED,appl_id->id);
282 temp_str = psiconv_make_printable(appl_id->name); 414 if (!(temp_str = psiconv_make_printable(appl_id->name)))
415 goto ERROR4;
283 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 416 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
284 "TextEd.app",temp_str); 417 "TextEd.app",temp_str);
285 free(temp_str); 418 free(temp_str);
419 res = -PSICONV_E_PARSE;
420 goto ERROR4;
286 } 421 }
287 422
288 psiconv_progress(lev+2,sto, 423 psiconv_progress(config,lev+2,sto,
289 "Looking for the Page layout section"); 424 "Looking for the Page layout section");
290 if (! page_sec) { 425 if (! page_sec) {
291 psiconv_warn(lev+2,sto, 426 psiconv_warn(config,lev+2,sto,
292 "Page layout section not found in the section table"); 427 "Page layout section not found in the section table");
293 (*result)->page_sec = NULL; 428 res = -PSICONV_E_PARSE;
294 res = -1; 429 goto ERROR4;
295 } else { 430 } else {
296 psiconv_debug(lev+2,sto, 431 psiconv_debug(config,lev+2,sto,
297 "Page layout section at offset %08x",page_sec); 432 "Page layout section at offset %08x",page_sec);
298 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 433 if ((res = psiconv_parse_page_layout_section(config,buf,lev+2,page_sec,NULL,
299 &(*result)->page_sec); 434 &(*result)->page_sec)))
435 goto ERROR4;
300 } 436 }
301 437
302 base_char = psiconv_basic_character_layout(); 438 if (!(base_char = psiconv_basic_character_layout()))
439 goto ERROR5;
303 base_para = psiconv_basic_paragraph_layout(); 440 if (!(base_para = psiconv_basic_paragraph_layout()))
441 goto ERROR6;
304 442
305 psiconv_progress(lev+2,sto, 443 psiconv_progress(config,lev+2,sto,
306 "Looking for the TextEd section"); 444 "Looking for the TextEd section");
307 if (! texted_sec) { 445 if (! texted_sec) {
308 psiconv_warn(lev+2,sto, 446 psiconv_warn(config,lev+2,sto,
309 "TextEd section not found in the section table"); 447 "TextEd section not found in the section table");
310 (*result)->texted_sec = NULL; 448 res = -PSICONV_E_PARSE;
311 res = -1; 449 goto ERROR7;
312 } else { 450 } else {
313 psiconv_debug(lev+2,sto, "TextEd section at offset %08x",texted_sec); 451 psiconv_debug(config,lev+2,sto, "TextEd section at offset %08x",texted_sec);
314 res |= psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL, 452 if ((res = psiconv_parse_texted_section(config,buf,lev+2,texted_sec,NULL,
315 &(*result)->texted_sec, 453 &(*result)->texted_sec,
316 base_char,base_para); 454 base_char,base_para)))
455 goto ERROR7;
317 } 456 }
318 psiconv_free_character_layout(base_char); 457 psiconv_free_character_layout(base_char);
319 psiconv_free_paragraph_layout(base_para); 458 psiconv_free_paragraph_layout(base_para);
320 459
321 psiconv_free_application_id_section(appl_id); 460 psiconv_free_application_id_section(appl_id);
322 psiconv_free_section_table_section(table); 461 psiconv_free_section_table_section(table);
323 462
324 psiconv_progress(lev+1,off,"End of word file"); 463 psiconv_progress(config,lev+1,off,"End of TextEd file");
464 return 0;
465
466ERROR7:
467 psiconv_free_paragraph_layout(base_para);
468ERROR6:
469 psiconv_free_character_layout(base_char);
470ERROR5:
471 psiconv_free_page_layout_section((*result)->page_sec);
472ERROR4:
473 psiconv_free_application_id_section(appl_id);
474ERROR3:
475 psiconv_free_section_table_section(table);
476ERROR2:
477 free(*result);
478ERROR1:
479 psiconv_warn(config,lev+1,off,"Reading of TextEd File failed");
480 if (res == 0)
481 return -PSICONV_E_NOMEM;
482 else
325 return res; 483 return res;
326} 484}
327 485
328int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 486int psiconv_parse_word_file(const psiconv_config config,
487 const psiconv_buffer buf,int lev, psiconv_u32 off,
329 psiconv_word_f *result) 488 psiconv_word_f *result)
330{ 489{
331 int res=0; 490 int res=0;
332 psiconv_section_table_section table; 491 psiconv_section_table_section table;
333 psiconv_application_id_section appl_id; 492 psiconv_application_id_section appl_id;
… …
341 psiconv_u32 applid_sec = 0; 500 psiconv_u32 applid_sec = 0;
342 psiconv_section_table_entry entry; 501 psiconv_section_table_entry entry;
343 psiconv_u32 sto; 502 psiconv_u32 sto;
344 int i; 503 int i;
345 504
346 psiconv_progress(lev+1,off,"Going to read a word file"); 505 psiconv_progress(config,lev+1,off,"Going to read a word file");
347 *result = malloc(sizeof(**result)); 506 if (!(*result = malloc(sizeof(**result))))
507 goto ERROR1;
348 508
349 psiconv_progress(lev+2,off, 509 psiconv_progress(config,lev+2,off,
350 "Going to read the offset of the section table section"); 510 "Going to read the offset of the section table section");
351 sto = psiconv_read_u32(buf,lev+2,off); 511 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
512 if (res)
513 goto ERROR2;
352 psiconv_debug(lev+2,off,"Offset: %08x",sto); 514 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
353 515
354 psiconv_progress(lev+2,sto, 516 psiconv_progress(config,lev+2,sto,
355 "Going to read the section table section"); 517 "Going to read the section table section");
356 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table); 518 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
519 goto ERROR2;
357 520
358 for (i = 0; i < psiconv_list_length(table); i ++) { 521 for (i = 0; i < psiconv_list_length(table); i ++) {
359 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 522 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
360 entry = psiconv_list_get(table,i); 523 if (!(entry = psiconv_list_get(table,i)))
524 goto ERROR3;
361 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 525 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
362 applid_sec = entry->offset; 526 applid_sec = entry->offset;
363 psiconv_debug(lev+3,sto, 527 psiconv_debug(config,lev+3,sto,
364 "Found the Application ID section at %08x",applid_sec); 528 "Found the Application ID section at %08x",applid_sec);
365 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 529 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
366 page_sec = entry->offset; 530 page_sec = entry->offset;
367 psiconv_debug(lev+3,sto, 531 psiconv_debug(config,lev+3,sto,
368 "Found the Page Layout section at %08x",page_sec); 532 "Found the Page Layout section at %08x",page_sec);
369 } else if (entry->id == PSICONV_ID_TEXT_SECTION) { 533 } else if (entry->id == PSICONV_ID_TEXT_SECTION) {
370 text_sec = entry->offset; 534 text_sec = entry->offset;
371 psiconv_debug(lev+3,sto, "Found the Text section at %08x",text_sec); 535 psiconv_debug(config,lev+3,sto, "Found the Text section at %08x",text_sec);
372 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) { 536 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {
373 pwd_sec = entry->offset; 537 pwd_sec = entry->offset;
374 psiconv_debug(lev+3,sto, 538 psiconv_debug(config,lev+3,sto,
375 "Found the Password section at %08x",pwd_sec); 539 "Found the Password section at %08x",pwd_sec);
376 psiconv_warn(lev+3,sto, 540 psiconv_warn(config,lev+3,sto,
377 "Password section found - can't read encrypted data"); 541 "Password section found - can't read encrypted data");
378 res = -1; 542 res = -PSICONV_E_PARSE;
543 goto ERROR3;
379 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) { 544 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {
380 status_sec = entry->offset; 545 status_sec = entry->offset;
381 psiconv_debug(lev+3,sto, 546 psiconv_debug(config,lev+3,sto,
382 "Found the Word Status section at %08x",status_sec); 547 "Found the Word Status section at %08x",status_sec);
383 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) { 548 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {
384 styles_sec = entry->offset; 549 styles_sec = entry->offset;
385 psiconv_debug(lev+3,sto, 550 psiconv_debug(config,lev+3,sto,
386 "Found the Word Styles section at %08x",styles_sec); 551 "Found the Word Styles section at %08x",styles_sec);
387 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) { 552 } else if (entry->id == PSICONV_ID_LAYOUT_SECTION) {
388 layout_sec = entry->offset; 553 layout_sec = entry->offset;
389 psiconv_debug(lev+3,sto, 554 psiconv_debug(config,lev+3,sto,
390 "Found the Layout section at %08x",layout_sec); 555 "Found the Layout section at %08x",layout_sec);
391 } else { 556 } else {
392 psiconv_warn(lev+3,sto, 557 psiconv_warn(config,lev+3,sto,
393 "Found unknown section in the Section Table"); 558 "Found unknown section in the Section Table (ignoring)");
394 psiconv_debug(lev+3,sto, 559 psiconv_debug(config,lev+3,sto,
395 "Section ID %08x, offset %08x",entry->id,entry->offset); 560 "Section ID %08x, offset %08x",entry->id,entry->offset);
396 res = -1;
397 } 561 }
398 } 562 }
399 563
400 564
401 psiconv_progress(lev+2,sto, 565 psiconv_progress(config,lev+2,sto,
402 "Looking for the Status section"); 566 "Looking for the Status section");
403 if (!status_sec) { 567 if (!status_sec) {
404 psiconv_warn(lev+2,sto, "Status section not found in the section table"); 568 psiconv_warn(config,lev+2,sto, "Status section not found in the section table");
405 res = -1; 569 res = -PSICONV_E_PARSE;
570 goto ERROR3;
406 } else { 571 } else {
407 psiconv_debug(lev+2,sto, "Status section at offset %08x",status_sec); 572 psiconv_debug(config,lev+2,sto, "Status section at offset %08x",status_sec);
408 res |= psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL, 573 if ((res = psiconv_parse_word_status_section(config,buf,lev+2,status_sec,NULL,
409 &((*result)->status_sec)); 574 &((*result)->status_sec))))
575 goto ERROR3;
410 } 576 }
411 577
412 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 578 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
413 if (! applid_sec) { 579 if (! applid_sec) {
414 psiconv_warn(lev+2,sto, 580 psiconv_warn(config,lev+2,sto,
415 "Application ID section not found in the section table"); 581 "Application ID section not found in the section table");
416 res = -1; 582 res = -PSICONV_E_PARSE;
583 goto ERROR4;
417 } else { 584 } else {
418 psiconv_debug(lev+2,sto, 585 psiconv_debug(config,lev+2,sto,
419 "Application ID section at offset %08x",applid_sec); 586 "Application ID section at offset %08x",applid_sec);
420 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 587 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
421 &appl_id); 588 &appl_id)))
589 goto ERROR4;
422 } 590 }
423 if ((appl_id->id != PSICONV_ID_WORD) || 591 if ((appl_id->id != PSICONV_ID_WORD) ||
424 strcmp(appl_id->name,"Word.app")) { 592 strcmp(appl_id->name,"Word.app")) {
425 psiconv_warn(lev+2,applid_sec, 593 psiconv_warn(config,lev+2,applid_sec,
426 "Application ID section contains unexpected data"); 594 "Application ID section contains unexpected data");
427 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 595 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
428 PSICONV_ID_WORD,appl_id->id); 596 PSICONV_ID_WORD,appl_id->id);
429 temp_str = psiconv_make_printable(appl_id->name); 597 if (!(temp_str = psiconv_make_printable(appl_id->name)))
598 goto ERROR5;
430 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 599 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
431 "Word.app",temp_str); 600 "Word.app",temp_str);
432 free(temp_str); 601 free(temp_str);
602 res = -PSICONV_E_PARSE;
603 goto ERROR5;
433 } 604 }
434 605
435 psiconv_progress(lev+2,sto, 606 psiconv_progress(config,lev+2,sto,
436 "Looking for the Page layout section"); 607 "Looking for the Page layout section");
437 if (! page_sec) { 608 if (! page_sec) {
438 psiconv_warn(lev+2,sto, 609 psiconv_warn(config,lev+2,sto,
439 "Page layout section not found in the section table"); 610 "Page layout section not found in the section table");
440 (*result)->page_sec = NULL; 611 res = -PSICONV_E_PARSE;
441 res = -1; 612 goto ERROR5;
442 } else { 613 } else {
443 psiconv_debug(lev+2,sto, 614 psiconv_debug(config,lev+2,sto,
444 "Page layout section at offset %08x",page_sec); 615 "Page layout section at offset %08x",page_sec);
445 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 616 if ((res = psiconv_parse_page_layout_section(config,buf,lev+2,page_sec,NULL,
446 &(*result)->page_sec); 617 &(*result)->page_sec)))
618 goto ERROR5;
447 } 619 }
448 620
449 psiconv_progress(lev+2,sto, 621 psiconv_progress(config,lev+2,sto,
450 "Looking for the Word Style section"); 622 "Looking for the Word Style section");
451 if (!styles_sec) { 623 if (!styles_sec) {
452 psiconv_warn(lev+2,sto, 624 psiconv_warn(config,lev+2,sto,
453 "Word styles section not found in the section table"); 625 "Word styles section not found in the section table");
454 (*result)->styles_sec = NULL; 626 res = -PSICONV_E_PARSE;
455 res = -1; 627 goto ERROR6;
456 } else { 628 } else {
457 psiconv_debug(lev+2,sto, 629 psiconv_debug(config,lev+2,sto,
458 "Word styles section at offset %08x",styles_sec); 630 "Word styles section at offset %08x",styles_sec);
459 res |= psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL, 631 if ((res = psiconv_parse_word_styles_section(config,buf,lev+2,styles_sec,NULL,
460 &(*result)->styles_sec); 632 &(*result)->styles_sec)))
633 goto ERROR6;
461 } 634 }
462 635
463 psiconv_progress(lev+2,sto, 636 psiconv_progress(config,lev+2,sto,
464 "Looking for the Text section"); 637 "Looking for the Text section");
465 if (!text_sec) { 638 if (!text_sec) {
466 psiconv_warn(lev+2,sto, "Text section not found in the section table"); 639 psiconv_warn(config,lev+2,sto, "Text section not found in the section table");
467 (*result)->paragraphs = NULL; 640 res = -PSICONV_E_PARSE;
468 res = -1; 641 goto ERROR7;
469 } else { 642 } else {
470 psiconv_debug(lev+2,sto, 643 psiconv_debug(config,lev+2,sto,
471 "Text section at offset %08x",text_sec); 644 "Text section at offset %08x",text_sec);
472 res |= psiconv_parse_text_section(buf,lev+2,text_sec,NULL, 645 if ((res = psiconv_parse_text_section(config,buf,lev+2,text_sec,NULL,
473 &(*result)->paragraphs); 646 &(*result)->paragraphs)))
647 goto ERROR7;
474 } 648 }
475 649
476 if (((*result)->paragraphs) && ((*result)->styles_sec)) { 650 psiconv_progress(config,lev+2,sto, "Looking for the Layout section");
477 psiconv_progress(lev+2,sto,
478 "Looking for the Layout section");
479 if (!layout_sec) { 651 if (!layout_sec) {
480 psiconv_debug(lev+2,sto, 652 psiconv_debug(config,lev+2,sto, "No layout section today");
481 "Layout section not found in the section table");
482 res = -1;
483 } else { 653 } else {
484 psiconv_debug(lev+2,sto, 654 psiconv_debug(config,lev+2,sto,
485 "Layout section at offset %08x",layout_sec); 655 "Layout section at offset %08x",layout_sec);
486 res |= psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL, 656 if ((res = psiconv_parse_styled_layout_section(config,buf,lev+2,layout_sec,NULL,
487 (*result)->paragraphs, 657 (*result)->paragraphs,
488 (*result)->styles_sec); 658 (*result)->styles_sec)))
659 goto ERROR8;
489 } 660 }
490 } else
491 psiconv_debug(lev+2,sto,
492 "Skipping search for Layout section, as either the "
493 "text or the word styles section was not found");
494 661
495 psiconv_free_application_id_section(appl_id); 662 psiconv_free_application_id_section(appl_id);
496 psiconv_free_section_table_section(table); 663 psiconv_free_section_table_section(table);
497 664
498 psiconv_progress(lev+1,off,"End of word file"); 665 psiconv_progress(config,lev+1,off,"End of word file");
666 return 0;
667
668
669ERROR8:
670 psiconv_free_text_and_layout((*result)->paragraphs);
671ERROR7:
672 psiconv_free_word_styles_section((*result)->styles_sec);
673ERROR6:
674 psiconv_free_page_layout_section((*result)->page_sec);
675ERROR5:
676 psiconv_free_application_id_section(appl_id);
677ERROR4:
678 psiconv_free_word_status_section((*result)->status_sec);
679ERROR3:
680 psiconv_free_section_table_section(table);
681ERROR2:
682 free(*result);
683ERROR1:
684 psiconv_warn(config,lev+1,off,"Reading of Word File failed");
685 if (res == 0)
686 return -PSICONV_E_NOMEM;
687 else
499 return res; 688 return res;
500} 689}
690
691int psiconv_parse_sheet_file(const psiconv_config config,
692 const psiconv_buffer buf,int lev, psiconv_u32 off,
693 psiconv_sheet_f *result)
694{
695 int res=0;
696 psiconv_section_table_section table;
697 psiconv_application_id_section appl_id;
698 char *temp_str;
699 psiconv_u32 pwd_sec = 0;
700 psiconv_u32 status_sec = 0;
701 psiconv_u32 page_sec = 0;
702 psiconv_u32 applid_sec = 0;
703 psiconv_u32 workbook_sec = 0;
704 psiconv_section_table_entry entry;
705 psiconv_u32 sto;
706 int i;
707
708 psiconv_progress(config,lev+1,off,"Going to read a sheet file");
709 if (!(*result = malloc(sizeof(**result))))
710 goto ERROR1;
711
712 psiconv_progress(config,lev+2,off,
713 "Going to read the offset of the section table section");
714 sto = psiconv_read_u32(config,buf,lev+2,off,&res);
715 if (res)
716 goto ERROR2;
717 psiconv_debug(config,lev+2,off,"Offset: %08x",sto);
718
719 psiconv_progress(config,lev+2,sto,
720 "Going to read the section table section");
721 if ((res = psiconv_parse_section_table_section(config,buf,lev+2,sto, NULL,&table)))
722 goto ERROR2;
723
724 for (i = 0; i < psiconv_list_length(table); i ++) {
725 psiconv_progress(config,lev+2,sto, "Going to read entry %d",i);
726 if (!(entry = psiconv_list_get(table,i)))
727 goto ERROR3;
728 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
729 applid_sec = entry->offset;
730 psiconv_debug(config,lev+3,sto,
731 "Found the Application ID section at %08x",applid_sec);
732 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
733 page_sec = entry->offset;
734 psiconv_debug(config,lev+3,sto,
735 "Found the Page Layout section at %08x",page_sec);
736 } else if (entry->id == PSICONV_ID_PASSWORD_SECTION) {
737 pwd_sec = entry->offset;
738 psiconv_debug(config,lev+3,sto,
739 "Found the Password section at %08x",pwd_sec);
740 psiconv_warn(config,lev+3,sto,
741 "Password section found - can't read encrypted data");
742 res = -PSICONV_E_PARSE;
743 goto ERROR3;
744 } else if (entry->id == PSICONV_ID_SHEET_WORKBOOK_SECTION) {
745 workbook_sec = entry->offset;
746 psiconv_debug(config,lev+3,sto,
747 "Found the Sheet Workbook section at %08x",workbook_sec);
748 } else if (entry->id == PSICONV_ID_SHEET_STATUS_SECTION) {
749 status_sec = entry->offset;
750 psiconv_debug(config,lev+3,sto,
751 "Found the Sheet Status section at %08x",status_sec);
752 } else {
753 psiconv_warn(config,lev+3,sto,
754 "Found unknown section in the Section Table (ignoring)");
755 psiconv_debug(config,lev+3,sto,
756 "Section ID %08x, offset %08x",entry->id,entry->offset);
757 }
758 }
759
760
761 psiconv_progress(config,lev+2,sto,
762 "Looking for the Status section");
763 if (!status_sec) {
764 psiconv_warn(config,lev+2,sto, "Status section not found in the section table");
765 res = -PSICONV_E_PARSE;
766 goto ERROR3;
767 } else {
768 psiconv_debug(config,lev+2,sto, "Status section at offset %08x",status_sec);
769 if ((res = psiconv_parse_sheet_status_section(config,buf,lev+2,status_sec,NULL,
770 &((*result)->status_sec))))
771 goto ERROR3;
772 }
773
774 psiconv_progress(config,lev+2,sto, "Looking for the Application ID section");
775 if (! applid_sec) {
776 psiconv_warn(config,lev+2,sto,
777 "Application ID section not found in the section table");
778 res = -PSICONV_E_PARSE;
779 goto ERROR4;
780 } else {
781 psiconv_debug(config,lev+2,sto,
782 "Application ID section at offset %08x",applid_sec);
783 if ((res = psiconv_parse_application_id_section(config,buf,lev+2,applid_sec,NULL,
784 &appl_id)))
785 goto ERROR4;
786 }
787 if ((appl_id->id != PSICONV_ID_SHEET) ||
788 strcmp(appl_id->name,"Sheet.app")) {
789 psiconv_warn(config,lev+2,applid_sec,
790 "Application ID section contains unexpected data");
791 psiconv_debug(config,lev+2,applid_sec,"ID: %08x expected, %08x found",
792 PSICONV_ID_SHEET,appl_id->id);
793 if (!(temp_str = psiconv_make_printable(appl_id->name)))
794 goto ERROR5;
795 psiconv_debug(config,lev+2,applid_sec,"Name: `%s' expected, `%s' found",
796 "Sheet.app",temp_str);
797 free(temp_str);
798 res = -PSICONV_E_PARSE;
799 goto ERROR5;
800 }
801
802 psiconv_progress(config,lev+2,sto,
803 "Looking for the Page layout section");
804 if (! page_sec) {
805 psiconv_warn(config,lev+2,sto,
806 "Page layout section not found in the section table");
807 res = -PSICONV_E_PARSE;
808 goto ERROR5;
809 } else {
810 psiconv_debug(config,lev+2,sto,
811 "Page layout section at offset %08x",page_sec);
812 if ((res = psiconv_parse_page_layout_section(config,buf,lev+2,page_sec,NULL,
813 &(*result)->page_sec)))
814 goto ERROR5;
815 }
816
817 psiconv_progress(config,lev+2,sto,
818 "Looking for the Sheet Workbook section");
819 if (! workbook_sec) {
820 psiconv_warn(config,lev+2,sto,
821 "Sheet workbook section not found in the section table");
822 res = -PSICONV_E_PARSE;
823 goto ERROR6;
824 } else {
825 psiconv_debug(config,lev+2,sto,
826 "Sheet workbook section at offset %08x",page_sec);
827 if ((res = psiconv_parse_sheet_workbook_section(config,buf,lev+2,workbook_sec,NULL,
828 &(*result)->workbook_sec)))
829 goto ERROR6;
830 }
831
832 psiconv_free_application_id_section(appl_id);
833 psiconv_free_section_table_section(table);
834
835 psiconv_progress(config,lev+1,off,"End of Sheet file");
836 return 0;
837
838ERROR6:
839 psiconv_free_page_layout_section((*result)->page_sec);
840ERROR5:
841 psiconv_free_application_id_section(appl_id);
842ERROR4:
843 psiconv_free_sheet_status_section((*result)->status_sec);
844ERROR3:
845 psiconv_free_section_table_section(table);
846ERROR2:
847 free(*result);
848ERROR1:
849 psiconv_warn(config,lev+1,off,"Reading of Sheet File failed");
850 if (res == 0)
851 return -PSICONV_E_NOMEM;
852 else
853 return res;
854}
Legend:
Removed from v.41  
changed lines
  Added in v.170
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26