/[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 42 Revision 66
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.
… …
29{ 29{
30 psiconv_header_section header; 30 psiconv_header_section header;
31 psiconv_file_type_t res; 31 psiconv_file_type_t res;
32 int leng; 32 int leng;
33 33
34 psiconv_parse_header_section(buf,0,0,&leng,&header); 34 if ((psiconv_parse_header_section(buf,0,0,&leng,&header)))
35 return psiconv_unknown_file;
35 res = header->file; 36 res = header->file;
36 if (result) 37 if (result)
37 *result = header; 38 *result = header;
38 else 39 else
39 psiconv_free_header_section(header); 40 psiconv_free_header_section(header);
… …
47 int res=0; 48 int res=0;
48 int lev=0; 49 int lev=0;
49 int off=0; 50 int off=0;
50 int leng; 51 int leng;
51 52
52 (*result) = malloc(sizeof(**result)); 53 if (!((*result) = malloc(sizeof(**result))))
54 goto ERROR1;
53 55
54 (*result)->type = psiconv_file_type(buf,&leng,NULL); 56 (*result)->type = psiconv_file_type(buf,&leng,NULL);
55 if ((*result)->type == psiconv_unknown_file) { 57 if ((*result)->type == psiconv_unknown_file) {
56 psiconv_warn(lev+1,off,"Unknown file type: can't parse!"); 58 psiconv_warn(lev+1,off,"Unknown file type: can't parse!");
57 (*result)->file = NULL; 59 (*result)->file = NULL;
58 res = -1;
59 } else if ((*result)->type == psiconv_word_file) 60 } else if ((*result)->type == psiconv_word_file)
60 res = psiconv_parse_word_file(buf,lev+2,leng, 61 res = psiconv_parse_word_file(buf,lev+2,leng,
61 (psiconv_word_f *)(&((*result)->file))); 62 (psiconv_word_f *)(&((*result)->file)));
62 else if ((*result)->type == psiconv_texted_file) 63 else if ((*result)->type == psiconv_texted_file)
63 res = psiconv_parse_texted_file(buf,lev+2,leng, 64 res = psiconv_parse_texted_file(buf,lev+2,leng,
… …
73 (psiconv_clipart_f *)(&((*result)->file))); 74 (psiconv_clipart_f *)(&((*result)->file)));
74 else { 75 else {
75 psiconv_warn(lev+1,off,"Can't parse this file yet!"); 76 psiconv_warn(lev+1,off,"Can't parse this file yet!");
76 (*result)->file = NULL; 77 (*result)->file = NULL;
77 } 78 }
78 res = -1; 79 if (res)
80 goto ERROR2;
81 return 0;
79 82
83ERROR2:
84 free(*result);
85ERROR1:
86 psiconv_warn(lev+1,off,"Reading of Psion File failed");
87 if (res == 0)
88 return -PSICONV_E_NOMEM;
89 else
80 return res; 90 return res;
81} 91}
82 92
83int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev, 93int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev,
84 psiconv_u32 off, psiconv_clipart_f *result) 94 psiconv_u32 off, psiconv_clipart_f *result)
85{ 95{
86 int res=0; 96 int res=0;
97 int i;
98 psiconv_jumptable_section table;
99 psiconv_clipart_section clipart;
100 psiconv_u32 *entry;
101
102 psiconv_progress(lev+1,off,"Going to read a clipart file");
87 (*result) = malloc(sizeof(**result)); 103 if (!((*result) = malloc(sizeof(**result))))
104 goto ERROR1;
105
106 psiconv_progress(lev+2,off,"Going to read the MBM jumptable");
107 if ((res = psiconv_parse_jumptable_section(buf,lev+2,off, NULL,&table)))
108 goto ERROR2;
109
110 psiconv_progress(lev+2,off,"Going to read the clipart sections");
111 if (!((*result)->sections = psiconv_list_new(sizeof(*clipart))))
112 goto ERROR3;
113 for (i = 0; i < psiconv_list_length(table); i ++) {
114 if (!(entry = psiconv_list_get(table,i)))
115 goto ERROR4;
116 psiconv_progress(lev+3,off,"Going to read clipart section %i",i);
117 if ((res = psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart)))
118 goto ERROR4;
119 if ((res = psiconv_list_add((*result)->sections,clipart)))
120 goto ERROR5;
121 }
122
123 psiconv_free_jumptable_section(table);
124 psiconv_progress(lev+1,off,"End of clipart file");
88 return 0; 125 return res;
126ERROR5:
127 psiconv_free_clipart_section(clipart);
128ERROR4:
129 for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
130 if (!(clipart = psiconv_list_get((*result)->sections,i))) {
131 psiconv_warn(lev+1,off,"Massive memory corruption");
132 goto ERROR3;
133 }
134 psiconv_free_clipart_section(clipart);
135 }
136 psiconv_list_free((*result)->sections);
137ERROR3:
138 psiconv_free_jumptable_section(table);
139ERROR2:
140 free(*result);
141ERROR1:
142 psiconv_warn(lev+1,off,"Reading of Clipart File failed");
143 if (res == 0)
144 return -PSICONV_E_NOMEM;
145 else
146 return res;
89} 147}
90 148
91int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 149int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off,
92 psiconv_mbm_f *result) 150 psiconv_mbm_f *result)
93{ 151{
… …
97 psiconv_paint_data_section paint; 155 psiconv_paint_data_section paint;
98 psiconv_u32 *entry; 156 psiconv_u32 *entry;
99 psiconv_u32 sto; 157 psiconv_u32 sto;
100 158
101 psiconv_progress(lev+1,off,"Going to read a mbm file"); 159 psiconv_progress(lev+1,off,"Going to read a mbm file");
102 *result = malloc(sizeof(**result)); 160 if (!(*result = malloc(sizeof(**result))))
161 goto ERROR1;
103 162
104 psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable"); 163 psiconv_progress(lev+2,off,"Going to read the offset of the MBM jumptable");
105 sto = psiconv_read_u32(buf,lev+2,off); 164 sto = psiconv_read_u32(buf,lev+2,off,&res);
165 if (res)
166 goto ERROR2;
106 psiconv_debug(lev+2,off,"Offset: %08x",sto); 167 psiconv_debug(lev+2,off,"Offset: %08x",sto);
107 168
108 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 169 psiconv_progress(lev+2,off,"Going to read the MBM jumptable");
109 res |= psiconv_parse_jumptable_section(buf,lev+2,sto, NULL,&table); 170 if ((res = psiconv_parse_jumptable_section(buf,lev+2,sto, NULL,&table)))
171 goto ERROR2;
110 172
111 psiconv_progress(lev+2,off,"Going to read the picture sections"); 173 psiconv_progress(lev+2,off,"Going to read the picture sections");
112 (*result)->sections = psiconv_list_new(sizeof(*paint)); 174 if (!((*result)->sections = psiconv_list_new(sizeof(*paint))))
175 goto ERROR3;
113 for (i = 0; i < psiconv_list_length(table); i ++) { 176 for (i = 0; i < psiconv_list_length(table); i ++) {
114 entry = psiconv_list_get(table,i); 177 if (!(entry = psiconv_list_get(table,i)))
178 goto ERROR4;
115 psiconv_progress(lev+3,off,"Going to read picture section %i",i); 179 psiconv_progress(lev+3,off,"Going to read picture section %i",i);
116 psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,&paint); 180 if ((res = psiconv_parse_paint_data_section(buf,lev+3,*entry,NULL,
181 0,&paint)))
182 goto ERROR4;
117 psiconv_list_add((*result)->sections,paint); 183 if ((res = psiconv_list_add((*result)->sections,paint)))
184 goto ERROR5;
118 } 185 }
119 186
120 psiconv_free_jumptable_section(table); 187 psiconv_free_jumptable_section(table);
121 psiconv_progress(lev+1,off,"End of mbm file"); 188 psiconv_progress(lev+1,off,"End of mbm file");
189 return 0;
190ERROR5:
191 psiconv_free_paint_data_section(paint);
192ERROR4:
193 for (i = 0; i < psiconv_list_length((*result)->sections); i++) {
194 if (!(paint = psiconv_list_get((*result)->sections,i))) {
195 psiconv_warn(lev+1,off,"Massive memory corruption");
196 goto ERROR3;
197 }
198 psiconv_free_paint_data_section(paint);
199 }
200 psiconv_list_free((*result)->sections);
201ERROR3:
202 psiconv_free_jumptable_section(table);
203ERROR2:
204 free(*result);
205ERROR1:
206 psiconv_warn(lev+1,off,"Reading of MBM File failed");
207 if (res == 0)
208 return -PSICONV_E_NOMEM;
209 else
122 return res; 210 return res;
123} 211}
124 212
125int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev, 213int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev,
126 psiconv_u32 off, 214 psiconv_u32 off,
127 psiconv_sketch_f *result) 215 psiconv_sketch_f *result)
… …
135 int i; 223 int i;
136 int res=0; 224 int res=0;
137 char *temp_str; 225 char *temp_str;
138 226
139 psiconv_progress(lev+1,off,"Going to read a sketch file"); 227 psiconv_progress(lev+1,off,"Going to read a sketch file");
140 *result = malloc(sizeof(**result)); 228 if (!(*result = malloc(sizeof(**result))))
229 goto ERROR1;
141 230
142 psiconv_progress(lev+2,off, 231 psiconv_progress(lev+2,off,
143 "Going to read the offset of the section table section"); 232 "Going to read the offset of the section table section");
144 sto = psiconv_read_u32(buf,lev+2,off); 233 sto = psiconv_read_u32(buf,lev+2,off,&res);
234 if (res)
235 goto ERROR2;
145 psiconv_debug(lev+2,off,"Offset: %08x",sto); 236 psiconv_debug(lev+2,off,"Offset: %08x",sto);
146 237
147 psiconv_progress(lev+2,sto, "Going to read the section table section"); 238 psiconv_progress(lev+2,sto, "Going to read the section table section");
148 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table); 239 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table)))
240 goto ERROR2;
149 241
150 for (i = 0; i < psiconv_list_length(table); i ++) { 242 for (i = 0; i < psiconv_list_length(table); i ++) {
151 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 243 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
152 entry = psiconv_list_get(table,i); 244 if (!(entry = psiconv_list_get(table,i)))
245 goto ERROR3;
153 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 246 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
154 applid_sec = entry->offset; 247 applid_sec = entry->offset;
155 psiconv_debug(lev+3,sto, 248 psiconv_debug(lev+3,sto,
156 "Found the Application ID section at %08x",applid_sec); 249 "Found the Application ID section at %08x",applid_sec);
157 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) { 250 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) {
158 sketch_sec = entry->offset; 251 sketch_sec = entry->offset;
159 psiconv_debug(lev+3,sto, 252 psiconv_debug(lev+3,sto,
160 "Found the Sketch section at %08x",sketch_sec); 253 "Found the Sketch section at %08x",sketch_sec);
161 } else { 254 } else {
162 psiconv_warn(lev+3,sto, 255 psiconv_warn(lev+3,sto,
163 "Found unknown section in the Section Table"); 256 "Found unknown section in the Section Table (ignoring)");
164 psiconv_debug(lev+3,sto, 257 psiconv_debug(lev+3,sto,
165 "Section ID %08x, offset %08x",entry->id,entry->offset); 258 "Section ID %08x, offset %08x",entry->id,entry->offset);
166 res = -1;
167 } 259 }
168 } 260 }
169 261
170 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 262 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
171 if (! applid_sec) { 263 if (! applid_sec) {
172 psiconv_warn(lev+2,sto, 264 psiconv_warn(lev+2,sto,
173 "Application ID section not found in the section table"); 265 "Application ID section not found in the section table");
174 res = -1; 266 res = -PSICONV_E_PARSE;
267 goto ERROR3;
175 } else { 268 } else {
176 psiconv_debug(lev+2,sto, 269 psiconv_debug(lev+2,sto,
177 "Application ID section at offset %08x",applid_sec); 270 "Application ID section at offset %08x",applid_sec);
178 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 271 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
179 &appl_id); 272 &appl_id)))
273 goto ERROR3;
180 } 274 }
181 if ((appl_id->id != PSICONV_ID_SKETCH) || 275 if ((appl_id->id != PSICONV_ID_SKETCH) ||
182 strcmp(appl_id->name,"Paint.app")) { 276 strcmp(appl_id->name,"Paint.app")) {
183 psiconv_warn(lev+2,applid_sec, 277 psiconv_warn(lev+2,applid_sec,
184 "Application ID section contains unexpected data"); 278 "Application ID section contains unexpected data");
185 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 279 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
186 PSICONV_ID_SKETCH,appl_id->id); 280 PSICONV_ID_SKETCH,appl_id->id);
187 temp_str = psiconv_make_printable(appl_id->name); 281 if (!(temp_str = psiconv_make_printable(appl_id->name)))
282 goto ERROR4;
188 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 283 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
189 "Paint.app",temp_str); 284 "Paint.app",temp_str);
190 free(temp_str); 285 free(temp_str);
286 res = -PSICONV_E_PARSE;
287 goto ERROR4;
191 } 288 }
192 289
193 psiconv_progress(lev+2,sto, "Looking for the Sketch section"); 290 psiconv_progress(lev+2,sto, "Looking for the Sketch section");
194 if (! sketch_sec) { 291 if (! sketch_sec) {
195 psiconv_warn(lev+2,sto, 292 psiconv_warn(lev+2,sto,
196 "Sketch section not found in the section table"); 293 "Sketch section not found in the section table");
197 res = -1;
198 } else { 294 } else {
199 psiconv_debug(lev+2,sto, 295 psiconv_debug(lev+2,sto,
200 "Sketch section at offset %08x",applid_sec); 296 "Sketch section at offset %08x",applid_sec);
201 res |= psiconv_parse_sketch_section(buf,lev+2,sketch_sec,NULL,0, 297 if ((res = psiconv_parse_sketch_section(buf,lev+2,sketch_sec,NULL,0,
202 &(*result)->sketch_sec); 298 &(*result)->sketch_sec)))
299 goto ERROR4;
203 } 300 }
204 301
205 psiconv_free_application_id_section(appl_id); 302 psiconv_free_application_id_section(appl_id);
206 psiconv_free_section_table_section(table); 303 psiconv_free_section_table_section(table);
207 304
208 psiconv_progress(lev+1,off,"End of word file"); 305 psiconv_progress(lev+1,off,"End of word file");
209 return res; 306 return res;
307
308ERROR4:
309 psiconv_free_application_id_section(appl_id);
310ERROR3:
311 free(table);
312ERROR2:
313 free(*result);
314ERROR1:
315 psiconv_warn(lev+1,off,"Reading of Scketch File failed");
316 if (res == 0)
317 return -PSICONV_E_NOMEM;
318 else
319 return res;
210} 320}
211
212 321
213 322
214int psiconv_parse_texted_file(const psiconv_buffer buf,int lev, 323int psiconv_parse_texted_file(const psiconv_buffer buf,int lev,
215 psiconv_u32 off, 324 psiconv_u32 off,
216 psiconv_texted_f *result) 325 psiconv_texted_f *result)
… …
227 psiconv_u32 sto; 336 psiconv_u32 sto;
228 psiconv_section_table_entry entry; 337 psiconv_section_table_entry entry;
229 int i; 338 int i;
230 339
231 psiconv_progress(lev+1,off,"Going to read a texted file"); 340 psiconv_progress(lev+1,off,"Going to read a texted file");
232 *result = malloc(sizeof(**result)); 341 if (!(*result = malloc(sizeof(**result))))
342 goto ERROR1;
233 343
234 psiconv_progress(lev+2,off, 344 psiconv_progress(lev+2,off,
235 "Going to read the offset of the section table section"); 345 "Going to read the offset of the section table section");
236 sto = psiconv_read_u32(buf,lev+2,off); 346 sto = psiconv_read_u32(buf,lev+2,off,&res);
347 if (res)
348 goto ERROR2;
237 psiconv_debug(lev+2,off,"Offset: %08x",sto); 349 psiconv_debug(lev+2,off,"Offset: %08x",sto);
238 350
239 psiconv_progress(lev+2,sto, "Going to read the section table section"); 351 psiconv_progress(lev+2,sto, "Going to read the section table section");
240 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table); 352 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table)))
353 goto ERROR2;
241 354
242 for (i = 0; i < psiconv_list_length(table); i ++) { 355 for (i = 0; i < psiconv_list_length(table); i ++) {
243 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 356 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
244 entry = psiconv_list_get(table,i); 357 if (!(entry = psiconv_list_get(table,i)))
358 goto ERROR3;
245 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 359 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
246 applid_sec = entry->offset; 360 applid_sec = entry->offset;
247 psiconv_debug(lev+3,sto, 361 psiconv_debug(lev+3,sto,
248 "Found the Application ID section at %08x",applid_sec); 362 "Found the Application ID section at %08x",applid_sec);
249 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 363 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
… …
254 texted_sec = entry->offset; 368 texted_sec = entry->offset;
255 psiconv_debug(lev+3,sto, 369 psiconv_debug(lev+3,sto,
256 "Found the TextEd section at %08x",texted_sec); 370 "Found the TextEd section at %08x",texted_sec);
257 } else { 371 } else {
258 psiconv_warn(lev+3,sto, 372 psiconv_warn(lev+3,sto,
259 "Found unknown section in the Section Table"); 373 "Found unknown section in the Section Table (ignoring)");
260 psiconv_debug(lev+3,sto, 374 psiconv_debug(lev+3,sto,
261 "Section ID %08x, offset %08x",entry->id,entry->offset); 375 "Section ID %08x, offset %08x",entry->id,entry->offset);
262 res = -1;
263 } 376 }
264 } 377 }
265 378
266 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 379 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
267 if (! applid_sec) { 380 if (! applid_sec) {
268 psiconv_warn(lev+2,sto, 381 psiconv_warn(lev+2,sto,
269 "Application ID section not found in the section table"); 382 "Application ID section not found in the section table");
270 res = -1; 383 res = -PSICONV_E_PARSE;
384 goto ERROR3;
271 } else { 385 } else {
272 psiconv_debug(lev+2,sto, 386 psiconv_debug(lev+2,sto,
273 "Application ID section at offset %08x",applid_sec); 387 "Application ID section at offset %08x",applid_sec);
274 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 388 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
275 &appl_id); 389 &appl_id)))
390 goto ERROR3;
276 } 391 }
277 if ((appl_id->id != PSICONV_ID_TEXTED) || 392 if ((appl_id->id != PSICONV_ID_TEXTED) ||
278 strcmp(appl_id->name,"TextEd.app")) { 393 strcmp(appl_id->name,"TextEd.app")) {
279 psiconv_warn(lev+2,applid_sec, 394 psiconv_warn(lev+2,applid_sec,
280 "Application ID section contains unexpected data"); 395 "Application ID section contains unexpected data");
281 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 396 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
282 PSICONV_ID_TEXTED,appl_id->id); 397 PSICONV_ID_TEXTED,appl_id->id);
283 temp_str = psiconv_make_printable(appl_id->name); 398 if (!(temp_str = psiconv_make_printable(appl_id->name)))
399 goto ERROR4;
284 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 400 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
285 "TextEd.app",temp_str); 401 "TextEd.app",temp_str);
286 free(temp_str); 402 free(temp_str);
403 res = -PSICONV_E_PARSE;
404 goto ERROR4;
287 } 405 }
288 406
289 psiconv_progress(lev+2,sto, 407 psiconv_progress(lev+2,sto,
290 "Looking for the Page layout section"); 408 "Looking for the Page layout section");
291 if (! page_sec) { 409 if (! page_sec) {
292 psiconv_warn(lev+2,sto, 410 psiconv_warn(lev+2,sto,
293 "Page layout section not found in the section table"); 411 "Page layout section not found in the section table");
294 (*result)->page_sec = NULL; 412 res = -PSICONV_E_PARSE;
295 res = -1; 413 goto ERROR4;
296 } else { 414 } else {
297 psiconv_debug(lev+2,sto, 415 psiconv_debug(lev+2,sto,
298 "Page layout section at offset %08x",page_sec); 416 "Page layout section at offset %08x",page_sec);
299 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 417 if ((res = psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,
300 &(*result)->page_sec); 418 &(*result)->page_sec)))
419 goto ERROR4;
301 } 420 }
302 421
303 base_char = psiconv_basic_character_layout(); 422 if (!(base_char = psiconv_basic_character_layout()))
423 goto ERROR5;
304 base_para = psiconv_basic_paragraph_layout(); 424 if (!(base_para = psiconv_basic_paragraph_layout()))
425 goto ERROR6;
305 426
306 psiconv_progress(lev+2,sto, 427 psiconv_progress(lev+2,sto,
307 "Looking for the TextEd section"); 428 "Looking for the TextEd section");
308 if (! texted_sec) { 429 if (! texted_sec) {
309 psiconv_warn(lev+2,sto, 430 psiconv_warn(lev+2,sto,
310 "TextEd section not found in the section table"); 431 "TextEd section not found in the section table");
311 (*result)->texted_sec = NULL; 432 res = -PSICONV_E_PARSE;
312 res = -1; 433 goto ERROR7;
313 } else { 434 } else {
314 psiconv_debug(lev+2,sto, "TextEd section at offset %08x",texted_sec); 435 psiconv_debug(lev+2,sto, "TextEd section at offset %08x",texted_sec);
315 res |= psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL, 436 if ((res = psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL,
316 &(*result)->texted_sec, 437 &(*result)->texted_sec,
317 base_char,base_para); 438 base_char,base_para)))
439 goto ERROR7;
318 } 440 }
319 psiconv_free_character_layout(base_char); 441 psiconv_free_character_layout(base_char);
320 psiconv_free_paragraph_layout(base_para); 442 psiconv_free_paragraph_layout(base_para);
321 443
322 psiconv_free_application_id_section(appl_id); 444 psiconv_free_application_id_section(appl_id);
323 psiconv_free_section_table_section(table); 445 psiconv_free_section_table_section(table);
324 446
325 psiconv_progress(lev+1,off,"End of word file"); 447 psiconv_progress(lev+1,off,"End of TextEd file");
448 return 0;
449
450ERROR7:
451 psiconv_free_paragraph_layout(base_para);
452ERROR6:
453 psiconv_free_character_layout(base_char);
454ERROR5:
455 psiconv_free_page_layout_section((*result)->page_sec);
456ERROR4:
457 psiconv_free_application_id_section(appl_id);
458ERROR3:
459 psiconv_free_section_table_section(table);
460ERROR2:
461 free(*result);
462ERROR1:
463 psiconv_warn(lev+1,off,"Reading of TextEd File failed");
464 if (res == 0)
465 return -PSICONV_E_NOMEM;
466 else
326 return res; 467 return res;
327} 468}
328 469
329int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 470int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off,
330 psiconv_word_f *result) 471 psiconv_word_f *result)
331{ 472{
… …
343 psiconv_section_table_entry entry; 484 psiconv_section_table_entry entry;
344 psiconv_u32 sto; 485 psiconv_u32 sto;
345 int i; 486 int i;
346 487
347 psiconv_progress(lev+1,off,"Going to read a word file"); 488 psiconv_progress(lev+1,off,"Going to read a word file");
348 *result = malloc(sizeof(**result)); 489 if (!(*result = malloc(sizeof(**result))))
490 goto ERROR1;
349 491
350 psiconv_progress(lev+2,off, 492 psiconv_progress(lev+2,off,
351 "Going to read the offset of the section table section"); 493 "Going to read the offset of the section table section");
352 sto = psiconv_read_u32(buf,lev+2,off); 494 sto = psiconv_read_u32(buf,lev+2,off,&res);
495 if (res)
496 goto ERROR2;
353 psiconv_debug(lev+2,off,"Offset: %08x",sto); 497 psiconv_debug(lev+2,off,"Offset: %08x",sto);
354 498
355 psiconv_progress(lev+2,sto, 499 psiconv_progress(lev+2,sto,
356 "Going to read the section table section"); 500 "Going to read the section table section");
357 res |= psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table); 501 if ((res = psiconv_parse_section_table_section(buf,lev+2,sto, NULL,&table)))
502 goto ERROR2;
358 503
359 for (i = 0; i < psiconv_list_length(table); i ++) { 504 for (i = 0; i < psiconv_list_length(table); i ++) {
360 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 505 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
361 entry = psiconv_list_get(table,i); 506 if (!(entry = psiconv_list_get(table,i)))
507 goto ERROR3;
362 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 508 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
363 applid_sec = entry->offset; 509 applid_sec = entry->offset;
364 psiconv_debug(lev+3,sto, 510 psiconv_debug(lev+3,sto,
365 "Found the Application ID section at %08x",applid_sec); 511 "Found the Application ID section at %08x",applid_sec);
366 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 512 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
… …
374 pwd_sec = entry->offset; 520 pwd_sec = entry->offset;
375 psiconv_debug(lev+3,sto, 521 psiconv_debug(lev+3,sto,
376 "Found the Password section at %08x",pwd_sec); 522 "Found the Password section at %08x",pwd_sec);
377 psiconv_warn(lev+3,sto, 523 psiconv_warn(lev+3,sto,
378 "Password section found - can't read encrypted data"); 524 "Password section found - can't read encrypted data");
379 res = -1; 525 res = -PSICONV_E_PARSE;
526 goto ERROR3;
380 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) { 527 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {
381 status_sec = entry->offset; 528 status_sec = entry->offset;
382 psiconv_debug(lev+3,sto, 529 psiconv_debug(lev+3,sto,
383 "Found the Word Status section at %08x",status_sec); 530 "Found the Word Status section at %08x",status_sec);
384 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) { 531 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {
… …
389 layout_sec = entry->offset; 536 layout_sec = entry->offset;
390 psiconv_debug(lev+3,sto, 537 psiconv_debug(lev+3,sto,
391 "Found the Layout section at %08x",layout_sec); 538 "Found the Layout section at %08x",layout_sec);
392 } else { 539 } else {
393 psiconv_warn(lev+3,sto, 540 psiconv_warn(lev+3,sto,
394 "Found unknown section in the Section Table"); 541 "Found unknown section in the Section Table (ignoring)");
395 psiconv_debug(lev+3,sto, 542 psiconv_debug(lev+3,sto,
396 "Section ID %08x, offset %08x",entry->id,entry->offset); 543 "Section ID %08x, offset %08x",entry->id,entry->offset);
397 res = -1;
398 } 544 }
399 } 545 }
400 546
401 547
402 psiconv_progress(lev+2,sto, 548 psiconv_progress(lev+2,sto,
403 "Looking for the Status section"); 549 "Looking for the Status section");
404 if (!status_sec) { 550 if (!status_sec) {
405 psiconv_warn(lev+2,sto, "Status section not found in the section table"); 551 psiconv_warn(lev+2,sto, "Status section not found in the section table");
406 res = -1; 552 res = -PSICONV_E_PARSE;
553 goto ERROR3;
407 } else { 554 } else {
408 psiconv_debug(lev+2,sto, "Status section at offset %08x",status_sec); 555 psiconv_debug(lev+2,sto, "Status section at offset %08x",status_sec);
409 res |= psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL, 556 if ((res = psiconv_parse_word_status_section(buf,lev+2,status_sec,NULL,
410 &((*result)->status_sec)); 557 &((*result)->status_sec))))
558 goto ERROR3;
411 } 559 }
412 560
413 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 561 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
414 if (! applid_sec) { 562 if (! applid_sec) {
415 psiconv_warn(lev+2,sto, 563 psiconv_warn(lev+2,sto,
416 "Application ID section not found in the section table"); 564 "Application ID section not found in the section table");
417 res = -1; 565 res = -PSICONV_E_PARSE;
566 goto ERROR4;
418 } else { 567 } else {
419 psiconv_debug(lev+2,sto, 568 psiconv_debug(lev+2,sto,
420 "Application ID section at offset %08x",applid_sec); 569 "Application ID section at offset %08x",applid_sec);
421 res |= psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL, 570 if ((res = psiconv_parse_application_id_section(buf,lev+2,applid_sec,NULL,
422 &appl_id); 571 &appl_id)))
572 goto ERROR4;
423 } 573 }
424 if ((appl_id->id != PSICONV_ID_WORD) || 574 if ((appl_id->id != PSICONV_ID_WORD) ||
425 strcmp(appl_id->name,"Word.app")) { 575 strcmp(appl_id->name,"Word.app")) {
426 psiconv_warn(lev+2,applid_sec, 576 psiconv_warn(lev+2,applid_sec,
427 "Application ID section contains unexpected data"); 577 "Application ID section contains unexpected data");
428 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 578 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
429 PSICONV_ID_WORD,appl_id->id); 579 PSICONV_ID_WORD,appl_id->id);
430 temp_str = psiconv_make_printable(appl_id->name); 580 if (!(temp_str = psiconv_make_printable(appl_id->name)))
581 goto ERROR5;
431 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 582 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
432 "Word.app",temp_str); 583 "Word.app",temp_str);
433 free(temp_str); 584 free(temp_str);
585 res = -PSICONV_E_PARSE;
586 goto ERROR5;
434 } 587 }
435 588
436 psiconv_progress(lev+2,sto, 589 psiconv_progress(lev+2,sto,
437 "Looking for the Page layout section"); 590 "Looking for the Page layout section");
438 if (! page_sec) { 591 if (! page_sec) {
439 psiconv_warn(lev+2,sto, 592 psiconv_warn(lev+2,sto,
440 "Page layout section not found in the section table"); 593 "Page layout section not found in the section table");
441 (*result)->page_sec = NULL; 594 res = -PSICONV_E_PARSE;
442 res = -1; 595 goto ERROR5;
443 } else { 596 } else {
444 psiconv_debug(lev+2,sto, 597 psiconv_debug(lev+2,sto,
445 "Page layout section at offset %08x",page_sec); 598 "Page layout section at offset %08x",page_sec);
446 res |= psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL, 599 if ((res = psiconv_parse_page_layout_section(buf,lev+2,page_sec,NULL,
447 &(*result)->page_sec); 600 &(*result)->page_sec)))
601 goto ERROR5;
448 } 602 }
449 603
450 psiconv_progress(lev+2,sto, 604 psiconv_progress(lev+2,sto,
451 "Looking for the Word Style section"); 605 "Looking for the Word Style section");
452 if (!styles_sec) { 606 if (!styles_sec) {
453 psiconv_warn(lev+2,sto, 607 psiconv_warn(lev+2,sto,
454 "Word styles section not found in the section table"); 608 "Word styles section not found in the section table");
455 (*result)->styles_sec = NULL; 609 res = -PSICONV_E_PARSE;
456 res = -1; 610 goto ERROR6;
457 } else { 611 } else {
458 psiconv_debug(lev+2,sto, 612 psiconv_debug(lev+2,sto,
459 "Word styles section at offset %08x",styles_sec); 613 "Word styles section at offset %08x",styles_sec);
460 res |= psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL, 614 if ((res = psiconv_parse_word_styles_section(buf,lev+2,styles_sec,NULL,
461 &(*result)->styles_sec); 615 &(*result)->styles_sec)))
616 goto ERROR6;
462 } 617 }
463 618
464 psiconv_progress(lev+2,sto, 619 psiconv_progress(lev+2,sto,
465 "Looking for the Text section"); 620 "Looking for the Text section");
466 if (!text_sec) { 621 if (!text_sec) {
467 psiconv_warn(lev+2,sto, "Text section not found in the section table"); 622 psiconv_warn(lev+2,sto, "Text section not found in the section table");
468 (*result)->paragraphs = NULL; 623 res = -PSICONV_E_PARSE;
469 res = -1; 624 goto ERROR7;
470 } else { 625 } else {
471 psiconv_debug(lev+2,sto, 626 psiconv_debug(lev+2,sto,
472 "Text section at offset %08x",text_sec); 627 "Text section at offset %08x",text_sec);
473 res |= psiconv_parse_text_section(buf,lev+2,text_sec,NULL, 628 if ((res = psiconv_parse_text_section(buf,lev+2,text_sec,NULL,
474 &(*result)->paragraphs); 629 &(*result)->paragraphs)))
630 goto ERROR7;
475 } 631 }
476 632
477 if (((*result)->paragraphs) && ((*result)->styles_sec)) { 633 psiconv_progress(lev+2,sto, "Looking for the Layout section");
478 psiconv_progress(lev+2,sto,
479 "Looking for the Layout section");
480 if (!layout_sec) { 634 if (!layout_sec) {
635 psiconv_debug(lev+2,sto, "No layout section today");
636 } else {
481 psiconv_debug(lev+2,sto, 637 psiconv_debug(lev+2,sto,
482 "Layout section not found in the section table");
483 res = -1;
484 } else {
485 psiconv_debug(lev+2,sto,
486 "Layout section at offset %08x",layout_sec); 638 "Layout section at offset %08x",layout_sec);
487 res |= psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL, 639 if ((res = psiconv_parse_styled_layout_section(buf,lev+2,layout_sec,NULL,
488 (*result)->paragraphs, 640 (*result)->paragraphs,
489 (*result)->styles_sec); 641 (*result)->styles_sec)))
642 goto ERROR8;
490 } 643 }
491 } else
492 psiconv_debug(lev+2,sto,
493 "Skipping search for Layout section, as either the "
494 "text or the word styles section was not found");
495 644
496 psiconv_free_application_id_section(appl_id); 645 psiconv_free_application_id_section(appl_id);
497 psiconv_free_section_table_section(table); 646 psiconv_free_section_table_section(table);
498 647
499 psiconv_progress(lev+1,off,"End of word file"); 648 psiconv_progress(lev+1,off,"End of word file");
500 return res; 649 return res;
650
651
652ERROR8:
653 psiconv_free_text_and_layout((*result)->paragraphs);
654ERROR7:
655 psiconv_free_word_styles_section((*result)->styles_sec);
656ERROR6:
657 psiconv_free_page_layout_section((*result)->page_sec);
658ERROR5:
659 psiconv_free_application_id_section(appl_id);
660ERROR4:
661 psiconv_free_word_status_section((*result)->status_sec);
662ERROR3:
663 psiconv_free_section_table_section(table);
664ERROR2:
665 free(*result);
666ERROR1:
667 psiconv_warn(lev+1,off,"Reading of Word File failed");
668 if (res == 0)
669 return -PSICONV_E_NOMEM;
670 else
671 return res;
501} 672}
Legend:
Removed from v.42  
changed lines
  Added in v.66
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26