Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lispreader.cpp 20 Mar 2004 18:09:49 -0000 1.6 +++ lispreader.cpp 20 Mar 2004 23:34:22 -0000 1.7 @@ -1,4 +1,4 @@ -/* $Id: lispreader.cpp,v 1.6 2004/03/20 18:09:49 grumbel Exp $ */ +/* $Id: lispreader.cpp,v 1.7 2004/03/20 23:34:22 grumbel Exp $ */ /* * lispreader.c * @@ -1196,6 +1196,7 @@ return lisp_obj; } +#if 0 void mygzungetc(char c, void* file) { gzungetc(c, file); @@ -1205,6 +1206,51 @@ { return lisp_stream_init_any (stream, file, gzgetc, mygzungetc); } +#endif + +lisp_object_t* lisp_read_from_gzfile(const char* filename) +{ + bool done = false; + lisp_object_t* root_obj = 0; + int chunk_size = 128 * 1024; + int buf_pos = 0; + int try_number = 1; + char* buf = static_cast(malloc(chunk_size)); + assert(buf); + + gzFile in = gzopen(filename, "r"); + + while (!done) + { + int ret = gzread(in, buf + buf_pos, chunk_size); + if (ret == -1) + { + free (buf); + assert(!"Error while reading from file"); + } + else if (ret == chunk_size) // buffer got full, eof not yet there so resize + { + buf_pos = chunk_size * try_number; + try_number += 1; + buf = static_cast(realloc(buf, chunk_size * try_number)); + assert(buf); + } + else + { + // everything fine, encountered EOF + done = true; + } + } + + lisp_stream_t stream; + lisp_stream_init_string (&stream, buf); + root_obj = lisp_read (&stream); + + free(buf); + gzclose(in); + + return root_obj; +} bool has_suffix(const char* data, const char* suffix) { @@ -1229,6 +1275,8 @@ if (has_suffix(filename, ".gz")) { + return lisp_read_from_gzfile(filename); +#if 0 lisp_object_t* obj = 0; gzFile in = gzopen(filename, "r"); @@ -1238,8 +1286,8 @@ obj = lisp_read(&stream); gzclose(in); } - - return obj; + return obj; +#endif } else {