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