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