/[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 43 Revision 163
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
27psiconv_file_type_t psiconv_file_type(psiconv_buffer buf,int *length, 34psiconv_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
93ERROR2:
94 free(*result);
95ERROR1:
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
83int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev, 103int 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{
… …
88 psiconv_jumptable_section table; 108 psiconv_jumptable_section table;
89 psiconv_clipart_section clipart; 109 psiconv_clipart_section clipart;
90 psiconv_u32 *entry; 110 psiconv_u32 *entry;
91 111
92 psiconv_progress(lev+1,off,"Going to read a clipart file"); 112 psiconv_progress(lev+1,off,"Going to read a clipart file");
93 (*result) = malloc(sizeof(**result)); 113 if (!((*result) = malloc(sizeof(**result))))
114 goto ERROR1;
94 115
95 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 116 psiconv_progress(lev+2,off,"Going to read the MBM jumptable");
96 res |= psiconv_parse_jumptable_section(buf,lev+2,off, NULL,&table); 117 if ((res = psiconv_parse_jumptable_section(buf,lev+2,off, NULL,&table)))
118 goto ERROR2;
97 119
98 psiconv_progress(lev+2,off,"Going to read the clipart sections"); 120 psiconv_progress(lev+2,off,"Going to read the clipart sections");
99 (*result)->sections = psiconv_list_new(sizeof(*clipart)); 121 if (!((*result)->sections = psiconv_list_new(sizeof(*clipart))))
122 goto ERROR3;
100 for (i = 0; i < psiconv_list_length(table); i ++) { 123 for (i = 0; i < psiconv_list_length(table); i ++) {
101 entry = psiconv_list_get(table,i); 124 if (!(entry = psiconv_list_get(table,i)))
125 goto ERROR4;
102 psiconv_progress(lev+3,off,"Going to read clipart section %i",i); 126 psiconv_progress(lev+3,off,"Going to read clipart section %i",i);
103 psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart); 127 if ((res = psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart)))
128 goto ERROR4;
104 psiconv_list_add((*result)->sections,clipart); 129 if ((res = psiconv_list_add((*result)->sections,clipart)))
130 goto ERROR5;
105 } 131 }
106 132
107 psiconv_free_jumptable_section(table); 133 psiconv_free_jumptable_section(table);
108 psiconv_progress(lev+1,off,"End of clipart file"); 134 psiconv_progress(lev+1,off,"End of clipart file");
109 return res; 135 return res;
136ERROR5:
137 psiconv_free_clipart_section(clipart);
138ERROR4:
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);
147ERROR3:
148 psiconv_free_jumptable_section(table);
149ERROR2:
150 free(*result);
151ERROR1:
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;
110} 157}
111 158
112int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 159int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off,
113 psiconv_mbm_f *result) 160 psiconv_mbm_f *result)
114{ 161{
… …
118 psiconv_paint_data_section paint; 165 psiconv_paint_data_section paint;
119 psiconv_u32 *entry; 166 psiconv_u32 *entry;
120 psiconv_u32 sto; 167 psiconv_u32 sto;
121 168
122 psiconv_progress(lev+1,off,"Going to read a mbm file"); 169 psiconv_progress(lev+1,off,"Going to read a mbm file");
123 *result = malloc(sizeof(**result)); 170 if (!(*result = malloc(sizeof(**result))))
171 goto ERROR1;
124 172
125 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");
126 sto = psiconv_read_u32(buf,lev+2,off); 174 sto = psiconv_read_u32(buf,lev+2,off,&res);
175 if (res)
176 goto ERROR2;
127 psiconv_debug(lev+2,off,"Offset: %08x",sto); 177 psiconv_debug(lev+2,off,"Offset: %08x",sto);
128 178
129 psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); 179 psiconv_progress(lev+2,off,"Going to read the MBM jumptable");
130 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;
131 182
132 psiconv_progress(lev+2,off,"Going to read the picture sections"); 183 psiconv_progress(lev+2,off,"Going to read the picture sections");
133 (*result)->sections = psiconv_list_new(sizeof(*paint)); 184 if (!((*result)->sections = psiconv_list_new(sizeof(*paint))))
185 goto ERROR3;
134 for (i = 0; i < psiconv_list_length(table); i ++) { 186 for (i = 0; i < psiconv_list_length(table); i ++) {
135 entry = psiconv_list_get(table,i); 187 if (!(entry = psiconv_list_get(table,i)))
188 goto ERROR4;
136 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);
137 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;
138 psiconv_list_add((*result)->sections,paint); 193 if ((res = psiconv_list_add((*result)->sections,paint)))
194 goto ERROR5;
139 } 195 }
140 196
141 psiconv_free_jumptable_section(table); 197 psiconv_free_jumptable_section(table);
142 psiconv_progress(lev+1,off,"End of mbm file"); 198 psiconv_progress(lev+1,off,"End of mbm file");
199 return 0;
200ERROR5:
201 psiconv_free_paint_data_section(paint);
202ERROR4:
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);
211ERROR3:
212 psiconv_free_jumptable_section(table);
213ERROR2:
214 free(*result);
215ERROR1:
216 psiconv_warn(lev+1,off,"Reading of MBM File failed");
217 if (res == 0)
218 return -PSICONV_E_NOMEM;
219 else
143 return res; 220 return res;
144} 221}
145 222
146int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev, 223int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev,
147 psiconv_u32 off, 224 psiconv_u32 off,
148 psiconv_sketch_f *result) 225 psiconv_sketch_f *result)
… …
156 int i; 233 int i;
157 int res=0; 234 int res=0;
158 char *temp_str; 235 char *temp_str;
159 236
160 psiconv_progress(lev+1,off,"Going to read a sketch file"); 237 psiconv_progress(lev+1,off,"Going to read a sketch file");
161 *result = malloc(sizeof(**result)); 238 if (!(*result = malloc(sizeof(**result))))
239 goto ERROR1;
162 240
163 psiconv_progress(lev+2,off, 241 psiconv_progress(lev+2,off,
164 "Going to read the offset of the section table section"); 242 "Going to read the offset of the section table section");
165 sto = psiconv_read_u32(buf,lev+2,off); 243 sto = psiconv_read_u32(buf,lev+2,off,&res);
244 if (res)
245 goto ERROR2;
166 psiconv_debug(lev+2,off,"Offset: %08x",sto); 246 psiconv_debug(lev+2,off,"Offset: %08x",sto);
167 247
168 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");
169 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;
170 251
171 for (i = 0; i < psiconv_list_length(table); i ++) { 252 for (i = 0; i < psiconv_list_length(table); i ++) {
172 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 253 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
173 entry = psiconv_list_get(table,i); 254 if (!(entry = psiconv_list_get(table,i)))
255 goto ERROR3;
174 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 256 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
175 applid_sec = entry->offset; 257 applid_sec = entry->offset;
176 psiconv_debug(lev+3,sto, 258 psiconv_debug(lev+3,sto,
177 "Found the Application ID section at %08x",applid_sec); 259 "Found the Application ID section at %08x",applid_sec);
178 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) { 260 } else if (entry->id == PSICONV_ID_SKETCH_SECTION) {
179 sketch_sec = entry->offset; 261 sketch_sec = entry->offset;
180 psiconv_debug(lev+3,sto, 262 psiconv_debug(lev+3,sto,
181 "Found the Sketch section at %08x",sketch_sec); 263 "Found the Sketch section at %08x",sketch_sec);
182 } else { 264 } else {
183 psiconv_warn(lev+3,sto, 265 psiconv_warn(lev+3,sto,
184 "Found unknown section in the Section Table"); 266 "Found unknown section in the Section Table (ignoring)");
185 psiconv_debug(lev+3,sto, 267 psiconv_debug(lev+3,sto,
186 "Section ID %08x, offset %08x",entry->id,entry->offset); 268 "Section ID %08x, offset %08x",entry->id,entry->offset);
187 res = -1;
188 } 269 }
189 } 270 }
190 271
191 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 272 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
192 if (! applid_sec) { 273 if (! applid_sec) {
193 psiconv_warn(lev+2,sto, 274 psiconv_warn(lev+2,sto,
194 "Application ID section not found in the section table"); 275 "Application ID section not found in the section table");
195 res = -1; 276 res = -PSICONV_E_PARSE;
277 goto ERROR3;
196 } else { 278 } else {
197 psiconv_debug(lev+2,sto, 279 psiconv_debug(lev+2,sto,
198 "Application ID section at offset %08x",applid_sec); 280 "Application ID section at offset %08x",applid_sec);
199 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,
200 &appl_id); 282 &appl_id)))
283 goto ERROR3;
201 } 284 }
202 if ((appl_id->id != PSICONV_ID_SKETCH) || 285 if ((appl_id->id != PSICONV_ID_SKETCH) ||
203 strcmp(appl_id->name,"Paint.app")) { 286 strcmp(appl_id->name,"Paint.app")) {
204 psiconv_warn(lev+2,applid_sec, 287 psiconv_warn(lev+2,applid_sec,
205 "Application ID section contains unexpected data"); 288 "Application ID section contains unexpected data");
206 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 289 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
207 PSICONV_ID_SKETCH,appl_id->id); 290 PSICONV_ID_SKETCH,appl_id->id);
208 temp_str = psiconv_make_printable(appl_id->name); 291 if (!(temp_str = psiconv_make_printable(appl_id->name)))
292 goto ERROR4;
209 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 293 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
210 "Paint.app",temp_str); 294 "Paint.app",temp_str);
211 free(temp_str); 295 free(temp_str);
296 res = -PSICONV_E_PARSE;
297 goto ERROR4;
212 } 298 }
213 299
214 psiconv_progress(lev+2,sto, "Looking for the Sketch section"); 300 psiconv_progress(lev+2,sto, "Looking for the Sketch section");
215 if (! sketch_sec) { 301 if (! sketch_sec) {
216 psiconv_warn(lev+2,sto, 302 psiconv_warn(lev+2,sto,
217 "Sketch section not found in the section table"); 303 "Sketch section not found in the section table");
218 res = -1;
219 } else { 304 } else {
220 psiconv_debug(lev+2,sto, 305 psiconv_debug(lev+2,sto,
221 "Sketch section at offset %08x",applid_sec); 306 "Sketch section at offset %08x",applid_sec);
222 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,
223 &(*result)->sketch_sec); 308 &(*result)->sketch_sec)))
309 goto ERROR4;
224 } 310 }
225 311
226 psiconv_free_application_id_section(appl_id); 312 psiconv_free_application_id_section(appl_id);
227 psiconv_free_section_table_section(table); 313 psiconv_free_section_table_section(table);
228 314
229 psiconv_progress(lev+1,off,"End of word file"); 315 psiconv_progress(lev+1,off,"End of word file");
230 return res; 316 return res;
317
318ERROR4:
319 psiconv_free_application_id_section(appl_id);
320ERROR3:
321 free(table);
322ERROR2:
323 free(*result);
324ERROR1:
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;
231} 330}
232
233 331
234 332
235int psiconv_parse_texted_file(const psiconv_buffer buf,int lev, 333int psiconv_parse_texted_file(const psiconv_buffer buf,int lev,
236 psiconv_u32 off, 334 psiconv_u32 off,
237 psiconv_texted_f *result) 335 psiconv_texted_f *result)
… …
248 psiconv_u32 sto; 346 psiconv_u32 sto;
249 psiconv_section_table_entry entry; 347 psiconv_section_table_entry entry;
250 int i; 348 int i;
251 349
252 psiconv_progress(lev+1,off,"Going to read a texted file"); 350 psiconv_progress(lev+1,off,"Going to read a texted file");
253 *result = malloc(sizeof(**result)); 351 if (!(*result = malloc(sizeof(**result))))
352 goto ERROR1;
254 353
255 psiconv_progress(lev+2,off, 354 psiconv_progress(lev+2,off,
256 "Going to read the offset of the section table section"); 355 "Going to read the offset of the section table section");
257 sto = psiconv_read_u32(buf,lev+2,off); 356 sto = psiconv_read_u32(buf,lev+2,off,&res);
357 if (res)
358 goto ERROR2;
258 psiconv_debug(lev+2,off,"Offset: %08x",sto); 359 psiconv_debug(lev+2,off,"Offset: %08x",sto);
259 360
260 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");
261 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;
262 364
263 for (i = 0; i < psiconv_list_length(table); i ++) { 365 for (i = 0; i < psiconv_list_length(table); i ++) {
264 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 366 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
265 entry = psiconv_list_get(table,i); 367 if (!(entry = psiconv_list_get(table,i)))
368 goto ERROR3;
266 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 369 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
267 applid_sec = entry->offset; 370 applid_sec = entry->offset;
268 psiconv_debug(lev+3,sto, 371 psiconv_debug(lev+3,sto,
269 "Found the Application ID section at %08x",applid_sec); 372 "Found the Application ID section at %08x",applid_sec);
270 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 373 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
… …
275 texted_sec = entry->offset; 378 texted_sec = entry->offset;
276 psiconv_debug(lev+3,sto, 379 psiconv_debug(lev+3,sto,
277 "Found the TextEd section at %08x",texted_sec); 380 "Found the TextEd section at %08x",texted_sec);
278 } else { 381 } else {
279 psiconv_warn(lev+3,sto, 382 psiconv_warn(lev+3,sto,
280 "Found unknown section in the Section Table"); 383 "Found unknown section in the Section Table (ignoring)");
281 psiconv_debug(lev+3,sto, 384 psiconv_debug(lev+3,sto,
282 "Section ID %08x, offset %08x",entry->id,entry->offset); 385 "Section ID %08x, offset %08x",entry->id,entry->offset);
283 res = -1;
284 } 386 }
285 } 387 }
286 388
287 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 389 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
288 if (! applid_sec) { 390 if (! applid_sec) {
289 psiconv_warn(lev+2,sto, 391 psiconv_warn(lev+2,sto,
290 "Application ID section not found in the section table"); 392 "Application ID section not found in the section table");
291 res = -1; 393 res = -PSICONV_E_PARSE;
394 goto ERROR3;
292 } else { 395 } else {
293 psiconv_debug(lev+2,sto, 396 psiconv_debug(lev+2,sto,
294 "Application ID section at offset %08x",applid_sec); 397 "Application ID section at offset %08x",applid_sec);
295 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,
296 &appl_id); 399 &appl_id)))
400 goto ERROR3;
297 } 401 }
298 if ((appl_id->id != PSICONV_ID_TEXTED) || 402 if ((appl_id->id != PSICONV_ID_TEXTED) ||
299 strcmp(appl_id->name,"TextEd.app")) { 403 strcmp(appl_id->name,"TextEd.app")) {
300 psiconv_warn(lev+2,applid_sec, 404 psiconv_warn(lev+2,applid_sec,
301 "Application ID section contains unexpected data"); 405 "Application ID section contains unexpected data");
302 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 406 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
303 PSICONV_ID_TEXTED,appl_id->id); 407 PSICONV_ID_TEXTED,appl_id->id);
304 temp_str = psiconv_make_printable(appl_id->name); 408 if (!(temp_str = psiconv_make_printable(appl_id->name)))
409 goto ERROR4;
305 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 410 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
306 "TextEd.app",temp_str); 411 "TextEd.app",temp_str);
307 free(temp_str); 412 free(temp_str);
413 res = -PSICONV_E_PARSE;
414 goto ERROR4;
308 } 415 }
309 416
310 psiconv_progress(lev+2,sto, 417 psiconv_progress(lev+2,sto,
311 "Looking for the Page layout section"); 418 "Looking for the Page layout section");
312 if (! page_sec) { 419 if (! page_sec) {
313 psiconv_warn(lev+2,sto, 420 psiconv_warn(lev+2,sto,
314 "Page layout section not found in the section table"); 421 "Page layout section not found in the section table");
315 (*result)->page_sec = NULL; 422 res = -PSICONV_E_PARSE;
316 res = -1; 423 goto ERROR4;
317 } else { 424 } else {
318 psiconv_debug(lev+2,sto, 425 psiconv_debug(lev+2,sto,
319 "Page layout section at offset %08x",page_sec); 426 "Page layout section at offset %08x",page_sec);
320 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,
321 &(*result)->page_sec); 428 &(*result)->page_sec)))
429 goto ERROR4;
322 } 430 }
323 431
324 base_char = psiconv_basic_character_layout(); 432 if (!(base_char = psiconv_basic_character_layout()))
433 goto ERROR5;
325 base_para = psiconv_basic_paragraph_layout(); 434 if (!(base_para = psiconv_basic_paragraph_layout()))
435 goto ERROR6;
326 436
327 psiconv_progress(lev+2,sto, 437 psiconv_progress(lev+2,sto,
328 "Looking for the TextEd section"); 438 "Looking for the TextEd section");
329 if (! texted_sec) { 439 if (! texted_sec) {
330 psiconv_warn(lev+2,sto, 440 psiconv_warn(lev+2,sto,
331 "TextEd section not found in the section table"); 441 "TextEd section not found in the section table");
332 (*result)->texted_sec = NULL; 442 res = -PSICONV_E_PARSE;
333 res = -1; 443 goto ERROR7;
334 } else { 444 } else {
335 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);
336 res |= psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL, 446 if ((res = psiconv_parse_texted_section(buf,lev+2,texted_sec,NULL,
337 &(*result)->texted_sec, 447 &(*result)->texted_sec,
338 base_char,base_para); 448 base_char,base_para)))
449 goto ERROR7;
339 } 450 }
340 psiconv_free_character_layout(base_char); 451 psiconv_free_character_layout(base_char);
341 psiconv_free_paragraph_layout(base_para); 452 psiconv_free_paragraph_layout(base_para);
342 453
343 psiconv_free_application_id_section(appl_id); 454 psiconv_free_application_id_section(appl_id);
344 psiconv_free_section_table_section(table); 455 psiconv_free_section_table_section(table);
345 456
346 psiconv_progress(lev+1,off,"End of word file"); 457 psiconv_progress(lev+1,off,"End of TextEd file");
458 return 0;
459
460ERROR7:
461 psiconv_free_paragraph_layout(base_para);
462ERROR6:
463 psiconv_free_character_layout(base_char);
464ERROR5:
465 psiconv_free_page_layout_section((*result)->page_sec);
466ERROR4:
467 psiconv_free_application_id_section(appl_id);
468ERROR3:
469 psiconv_free_section_table_section(table);
470ERROR2:
471 free(*result);
472ERROR1:
473 psiconv_warn(lev+1,off,"Reading of TextEd File failed");
474 if (res == 0)
475 return -PSICONV_E_NOMEM;
476 else
347 return res; 477 return res;
348} 478}
349 479
350int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off, 480int psiconv_parse_word_file(const psiconv_buffer buf,int lev, psiconv_u32 off,
351 psiconv_word_f *result) 481 psiconv_word_f *result)
352{ 482{
… …
364 psiconv_section_table_entry entry; 494 psiconv_section_table_entry entry;
365 psiconv_u32 sto; 495 psiconv_u32 sto;
366 int i; 496 int i;
367 497
368 psiconv_progress(lev+1,off,"Going to read a word file"); 498 psiconv_progress(lev+1,off,"Going to read a word file");
369 *result = malloc(sizeof(**result)); 499 if (!(*result = malloc(sizeof(**result))))
500 goto ERROR1;
370 501
371 psiconv_progress(lev+2,off, 502 psiconv_progress(lev+2,off,
372 "Going to read the offset of the section table section"); 503 "Going to read the offset of the section table section");
373 sto = psiconv_read_u32(buf,lev+2,off); 504 sto = psiconv_read_u32(buf,lev+2,off,&res);
505 if (res)
506 goto ERROR2;
374 psiconv_debug(lev+2,off,"Offset: %08x",sto); 507 psiconv_debug(lev+2,off,"Offset: %08x",sto);
375 508
376 psiconv_progress(lev+2,sto, 509 psiconv_progress(lev+2,sto,
377 "Going to read the section table section"); 510 "Going to read the section table section");
378 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;
379 513
380 for (i = 0; i < psiconv_list_length(table); i ++) { 514 for (i = 0; i < psiconv_list_length(table); i ++) {
381 psiconv_progress(lev+2,sto, "Going to read entry %d",i); 515 psiconv_progress(lev+2,sto, "Going to read entry %d",i);
382 entry = psiconv_list_get(table,i); 516 if (!(entry = psiconv_list_get(table,i)))
517 goto ERROR3;
383 if (entry->id == PSICONV_ID_APPL_ID_SECTION) { 518 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
384 applid_sec = entry->offset; 519 applid_sec = entry->offset;
385 psiconv_debug(lev+3,sto, 520 psiconv_debug(lev+3,sto,
386 "Found the Application ID section at %08x",applid_sec); 521 "Found the Application ID section at %08x",applid_sec);
387 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) { 522 } else if (entry->id == PSICONV_ID_PAGE_LAYOUT_SECTION) {
… …
395 pwd_sec = entry->offset; 530 pwd_sec = entry->offset;
396 psiconv_debug(lev+3,sto, 531 psiconv_debug(lev+3,sto,
397 "Found the Password section at %08x",pwd_sec); 532 "Found the Password section at %08x",pwd_sec);
398 psiconv_warn(lev+3,sto, 533 psiconv_warn(lev+3,sto,
399 "Password section found - can't read encrypted data"); 534 "Password section found - can't read encrypted data");
400 res = -1; 535 res = -PSICONV_E_PARSE;
536 goto ERROR3;
401 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) { 537 } else if (entry->id == PSICONV_ID_WORD_STATUS_SECTION) {
402 status_sec = entry->offset; 538 status_sec = entry->offset;
403 psiconv_debug(lev+3,sto, 539 psiconv_debug(lev+3,sto,
404 "Found the Word Status section at %08x",status_sec); 540 "Found the Word Status section at %08x",status_sec);
405 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) { 541 } else if (entry->id == PSICONV_ID_WORD_STYLES_SECTION) {
… …
410 layout_sec = entry->offset; 546 layout_sec = entry->offset;
411 psiconv_debug(lev+3,sto, 547 psiconv_debug(lev+3,sto,
412 "Found the Layout section at %08x",layout_sec); 548 "Found the Layout section at %08x",layout_sec);
413 } else { 549 } else {
414 psiconv_warn(lev+3,sto, 550 psiconv_warn(lev+3,sto,
415 "Found unknown section in the Section Table"); 551 "Found unknown section in the Section Table (ignoring)");
416 psiconv_debug(lev+3,sto, 552 psiconv_debug(lev+3,sto,
417 "Section ID %08x, offset %08x",entry->id,entry->offset); 553 "Section ID %08x, offset %08x",entry->id,entry->offset);
418 res = -1;
419 } 554 }
420 } 555 }
421 556
422 557
423 psiconv_progress(lev+2,sto, 558 psiconv_progress(lev+2,sto,
424 "Looking for the Status section"); 559 "Looking for the Status section");
425 if (!status_sec) { 560 if (!status_sec) {
426 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");
427 res = -1; 562 res = -PSICONV_E_PARSE;
563 goto ERROR3;
428 } else { 564 } else {
429 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);
430 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,
431 &((*result)->status_sec)); 567 &((*result)->status_sec))))
568 goto ERROR3;
432 } 569 }
433 570
434 psiconv_progress(lev+2,sto, "Looking for the Application ID section"); 571 psiconv_progress(lev+2,sto, "Looking for the Application ID section");
435 if (! applid_sec) { 572 if (! applid_sec) {
436 psiconv_warn(lev+2,sto, 573 psiconv_warn(lev+2,sto,
437 "Application ID section not found in the section table"); 574 "Application ID section not found in the section table");
438 res = -1; 575 res = -PSICONV_E_PARSE;
576 goto ERROR4;
439 } else { 577 } else {
440 psiconv_debug(lev+2,sto, 578 psiconv_debug(lev+2,sto,
441 "Application ID section at offset %08x",applid_sec); 579 "Application ID section at offset %08x",applid_sec);
442 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,
443 &appl_id); 581 &appl_id)))
582 goto ERROR4;
444 } 583 }
445 if ((appl_id->id != PSICONV_ID_WORD) || 584 if ((appl_id->id != PSICONV_ID_WORD) ||
446 strcmp(appl_id->name,"Word.app")) { 585 strcmp(appl_id->name,"Word.app")) {
447 psiconv_warn(lev+2,applid_sec, 586 psiconv_warn(lev+2,applid_sec,
448 "Application ID section contains unexpected data"); 587 "Application ID section contains unexpected data");
449 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found", 588 psiconv_debug(lev+2,applid_sec,"ID: %08x expected, %08x found",
450 PSICONV_ID_WORD,appl_id->id); 589 PSICONV_ID_WORD,appl_id->id);
451 temp_str = psiconv_make_printable(appl_id->name); 590 if (!(temp_str = psiconv_make_printable(appl_id->name)))
591 goto ERROR5;
452 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found", 592 psiconv_debug(lev+2,applid_sec,"Name: `%s' expected, `%s' found",
453 "Word.app",temp_str); 593 "Word.app",temp_str);
454 free(temp_str); 594 free(temp_str);
595 res = -PSICONV_E_PARSE;
596 goto ERROR5;
455 } 597 }
456 598
457 psiconv_progress(lev+2,sto, 599 psiconv_progress(lev+2,sto,
458 "Looking for the Page layout section"); 600 "Looking for the Page layout section");
459 if (! page_sec) { 601 if (! page_sec) {
460 psiconv_warn(lev+2,sto, 602 psiconv_warn(lev+2,sto,
461 "Page layout section not found in the section table"); 603 "Page layout section not found in the section table");
462 (*result)->page_sec = NULL; 604 res = -PSICONV_E_PARSE;
463 res = -1; 605 goto ERROR5;
464 } else { 606 } else {
465 psiconv_debug(lev+2,sto, 607 psiconv_debug(lev+2,sto,
466 "Page layout section at offset %08x",page_sec); 608 "Page layout section at offset %08x",page_sec);
467 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,
468 &(*result)->page_sec); 610 &(*result)->page_sec)))
611 goto ERROR5;
469 } 612 }
470 613
471 psiconv_progress(lev+2,sto, 614 psiconv_progress(lev+2,sto,
472 "Looking for the Word Style section"); 615 "Looking for the Word Style section");
473 if (!styles_sec) { 616 if (!styles_sec) {
474 psiconv_warn(lev+2,sto, 617 psiconv_warn(lev+2,sto,
475 "Word styles section not found in the section table"); 618 "Word styles section not found in the section table");
476 (*result)->styles_sec = NULL; 619 res = -PSICONV_E_PARSE;
477 res = -1; 620 goto ERROR6;
478 } else { 621 } else {
479 psiconv_debug(lev+2,sto, 622 psiconv_debug(lev+2,sto,
480 "Word styles section at offset %08x",styles_sec); 623 "Word styles section at offset %08x",styles_sec);
481 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,
482 &(*result)->styles_sec); 625 &(*result)->styles_sec)))
626 goto ERROR6;
483 } 627 }
484 628
485 psiconv_progress(lev+2,sto, 629 psiconv_progress(lev+2,sto,
486 "Looking for the Text section"); 630 "Looking for the Text section");
487 if (!text_sec) { 631 if (!text_sec) {
488 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");
489 (*result)->paragraphs = NULL; 633 res = -PSICONV_E_PARSE;
490 res = -1; 634 goto ERROR7;
491 } else { 635 } else {
492 psiconv_debug(lev+2,sto, 636 psiconv_debug(lev+2,sto,
493 "Text section at offset %08x",text_sec); 637 "Text section at offset %08x",text_sec);
494 res |= psiconv_parse_text_section(buf,lev+2,text_sec,NULL, 638 if ((res = psiconv_parse_text_section(buf,lev+2,text_sec,NULL,
495 &(*result)->paragraphs); 639 &(*result)->paragraphs)))
640 goto ERROR7;
496 } 641 }
497 642
498 if (((*result)->paragraphs) && ((*result)->styles_sec)) { 643 psiconv_progress(lev+2,sto, "Looking for the Layout section");
499 psiconv_progress(lev+2,sto,
500 "Looking for the Layout section");
501 if (!layout_sec) { 644 if (!layout_sec) {
645 psiconv_debug(lev+2,sto, "No layout section today");
646 } else {
502 psiconv_debug(lev+2,sto, 647 psiconv_debug(lev+2,sto,
503 "Layout section not found in the section table");
504 res = -1;
505 } else {
506 psiconv_debug(lev+2,sto,
507 "Layout section at offset %08x",layout_sec); 648 "Layout section at offset %08x",layout_sec);
508 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,
509 (*result)->paragraphs, 650 (*result)->paragraphs,
510 (*result)->styles_sec); 651 (*result)->styles_sec)))
652 goto ERROR8;
511 } 653 }
512 } else
513 psiconv_debug(lev+2,sto,
514 "Skipping search for Layout section, as either the "
515 "text or the word styles section was not found");
516 654
517 psiconv_free_application_id_section(appl_id); 655 psiconv_free_application_id_section(appl_id);
518 psiconv_free_section_table_section(table); 656 psiconv_free_section_table_section(table);
519 657
520 psiconv_progress(lev+1,off,"End of word file"); 658 psiconv_progress(lev+1,off,"End of word file");
659 return 0;
660
661
662ERROR8:
663 psiconv_free_text_and_layout((*result)->paragraphs);
664ERROR7:
665 psiconv_free_word_styles_section((*result)->styles_sec);
666ERROR6:
667 psiconv_free_page_layout_section((*result)->page_sec);
668ERROR5:
669 psiconv_free_application_id_section(appl_id);
670ERROR4:
671 psiconv_free_word_status_section((*result)->status_sec);
672ERROR3:
673 psiconv_free_section_table_section(table);
674ERROR2:
675 free(*result);
676ERROR1:
677 psiconv_warn(lev+1,off,"Reading of Word File failed");
678 if (res == 0)
679 return -PSICONV_E_NOMEM;
680 else
521 return res; 681 return res;
522} 682}
683
684int 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
830ERROR6:
831 psiconv_free_page_layout_section((*result)->page_sec);
832ERROR5:
833 psiconv_free_application_id_section(appl_id);
834ERROR4:
835 psiconv_free_sheet_status_section((*result)->status_sec);
836ERROR3:
837 psiconv_free_section_table_section(table);
838ERROR2:
839 free(*result);
840ERROR1:
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.43  
changed lines
  Added in v.163
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26