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