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

 Legend:



Removed from v.24
 


changed lines


 
Added in v.142
 Legend:



Removed from v.24
 


changed lines


 
Added in v.142
-Removed from v.24
+Added in v.142

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