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