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