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