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