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