/[public]/psiconv/trunk/lib/psiconv/parse_driver.c

Diff of /psiconv/trunk/lib/psiconv/parse_driver.c

Parent Directory | Revision Log | View Patch Patch

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

 Legend:



Removed from v.42
 


changed lines


 
Added in v.160
 Legend:



Removed from v.42
 


changed lines


 
Added in v.160
-Removed from v.42
+Added in v.160

frodo@frodo.looijaard.name	ViewVC Help
Powered by ViewVC 1.1.26