From: Lars Gullik Bjønnes Date: Sun, 27 Jul 2003 23:40:08 +0000 (+0000) Subject: zlib stuff X-Git-Tag: 1.6.10~16426 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a16c8a8759f48b9f49dc9bf24b37384c536ed515;p=features.git zlib stuff git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7405 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/po/POTFILES.in b/po/POTFILES.in index 87864eb78a..b03accf318 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -179,6 +179,7 @@ src/mathed/ref_inset.C src/paragraph.C src/paragraph_funcs.C src/rowpainter.C +src/support/path_defines.C src/text.C src/text2.C src/text3.C diff --git a/src/ChangeLog b/src/ChangeLog index 1d95ed9272..59bc1c6ed3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2003-07-28 Lars Gullik Bjønnes + + * lyxlex_pimpl.C (setFile): compress stuff + + * buffer.C (writeFile): add some compression stuff + (do_writeFile): new func, dont call expliti close... will this + breake anything? + + + * Makefile.am (lyx_LDADD): add -lz + 2003-07-28 José Matos * buffer.C: increment file format. @@ -9,14 +20,14 @@ * Makefile.am: remove special casing for configure-time setting of LYX_DIR, TOP_SRCDIR and LOCALEDIR. - * lyx_main.C (init): remove all Jean-Marc's magic setting of + * lyx_main.C (init): remove all Jean-Marc's magic setting of system_lyxdir, build_lyxdir and user_lyxdir into the support lib. 2003-07-26 André Pönitz - * paragraph_func.[Ch]: + * paragraph_func.[Ch]: * paragraph.C (realizeFont): inline it whereever it is used - + * rowpainter.C: * text.C: * text2.C: diff --git a/src/Makefile.am b/src/Makefile.am index 81b9e7f1b7..782df6578a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ BOOST_LIBS = -lboost_regex -lboost_signals endif lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \ - $(AIKSAURUS_LIBS) @LIBS@ + $(AIKSAURUS_LIBS) @LIBS@ -lz lyx_DEPENDENCIES = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) diff --git a/src/buffer.C b/src/buffer.C index 4c9c7c1bd0..d242264a1f 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -65,6 +65,7 @@ #include "support/FileInfo.h" #include "support/lyxmanip.h" #include "support/lyxtime.h" +#include "support/gzstream.h" #include #include @@ -636,10 +637,29 @@ bool Buffer::writeFile(string const & fname) const return false; } + bool const compressed = (fname.substr(fname.size() - 3, 3) == ".gz"); + + if (compressed) { + gz::ogzstream ofs(fname.c_str()); + + if (!ofs) + return false; + + return do_writeFile(ofs); + + } + ofstream ofs(fname.c_str()); if (!ofs) return false; + return do_writeFile(ofs); +} + + +bool Buffer::do_writeFile(ostream & ofs) const +{ + #ifdef HAVE_LOCALE // Use the standard "C" locale for file output. ofs.imbue(std::locale::classic()); @@ -669,7 +689,8 @@ bool Buffer::writeFile(string const & fname) const // Write marker that shows file is complete ofs << "\n\\the_end" << endl; - ofs.close(); + // Shouldn't really be needed.... + //ofs.close(); // how to check if close went ok? // Following is an attempt... (BE 20001011) diff --git a/src/buffer.h b/src/buffer.h index d3fd4229e3..60c98c841b 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -292,6 +292,8 @@ public: AuthorList & authors(); private: + bool do_writeFile(std::ostream & ofs) const; + typedef std::map DepClean; /// need to regenerate .tex ? diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C index 2962302d06..da7d92d9a3 100644 --- a/src/lyxlex_pimpl.C +++ b/src/lyxlex_pimpl.C @@ -113,17 +113,36 @@ void LyXLex::Pimpl::popTable() bool LyXLex::Pimpl::setFile(string const & filename) { + // Is this a compressed file or not? + bool const compressed = (filename.substr(filename.size() - 3, 3) == ".gz"); + // The check only outputs a debug message, because it triggers // a bug in compaq cxx 6.2, where is_open() returns 'true' for a // fresh new filebuf. (JMarc) - if (fb__.is_open() || is.tellg() > 0) - lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: " - "file or stream already set." << endl; - fb__.open(filename.c_str(), ios::in); - is.rdbuf(&fb__); - name = filename; - lineno = 0; - return fb__.is_open() && is.good(); + if (compressed) { + lyxerr << "lyxlex: compressed" << endl; + + if (gz__.is_open() || is.tellg() > 0) + lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: " + "file or stream already set." << endl; + gz__.open(filename.c_str(), ios::in); + is.rdbuf(&gz__); + name = filename; + lineno = 0; + return gz__.is_open() && is.good(); + } else { + lyxerr << "lyxlex: UNcompressed" << endl; + + if (fb__.is_open() || is.tellg() > 0) + lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: " + "file or stream already set." << endl; + fb__.open(filename.c_str(), ios::in); + is.rdbuf(&fb__); + name = filename; + lineno = 0; + return fb__.is_open() && is.good(); + } + } diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h index dd18a1262f..bc5876aba6 100644 --- a/src/lyxlex_pimpl.h +++ b/src/lyxlex_pimpl.h @@ -5,6 +5,8 @@ #include "lyxlex.h" +#include "support/gzstream.h" + #include #include @@ -43,8 +45,11 @@ struct LyXLex::Pimpl : boost::noncopyable { bool nextToken(); /// void pushToken(string const &); - /// fb__ is only used to open files, the stream is accessed through is + /// fb__ is only used to open files, the stream is accessed through is. std::filebuf fb__; + /// gz__ is only used to open files, the stream is accessed through is. + gz::gzstreambuf gz__; + /// the stream that we use. std::istream is; /// diff --git a/src/support/ChangeLog b/src/support/ChangeLog index f2e7616735..bbd9ad4366 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,6 +1,12 @@ +2003-07-28 Lars Gullik Bjønnes + + * gzstream.h: new file + + * gzstream.C: new file + 2003-07-27 Angus Leeming - * path_defines.{h,C.in} (build_lyxdir, system_lyxdir, + * path_defines.{h,C.in} (build_lyxdir, system_lyxdir, user_lyxdir): are now functions, not global vars. * Makefile.am: set build_lyxdir at make time. @@ -10,12 +16,12 @@ * path_defines.{h,C.in}: new files. Store/set the various lyx paths, lyx_dir, top_srcdir, localedir, system_lyxdir, build_lyxdir user_lyxdir. - + * Makefile.am: add some magic to enable the user to set the path to the system-level lyx support files, the top of the lyx build tree and the system-level lyx locale directory at _make_ time rather than configure time. - + * .cvsignore: add path_defines.C. 2003-07-26 Angus Leeming diff --git a/src/support/Makefile.am b/src/support/Makefile.am index f118de12d2..fa803b8d81 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -46,6 +46,8 @@ libsupport_la_SOURCES = \ forkedcontr.C \ forkedcontr.h \ getcwd.C \ + gzstream.C \ + gzstream.h \ kill.C \ limited_stack.h \ lstrings.C \ diff --git a/src/support/gzstream.C b/src/support/gzstream.C new file mode 100644 index 0000000000..ce356c7b82 --- /dev/null +++ b/src/support/gzstream.C @@ -0,0 +1,165 @@ +// ============================================================================ +// gzstream, C++ iostream classes wrapping the zlib compression library. +// Copyright (C) 2001 Deepak Bandyopadhyay, Lutz Kettner +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// ============================================================================ +// +// File : gzstream.C +// Revision : $Revision: 1.1 $ +// Revision_date : $Date: 2003/07/27 23:40:08 $ +// Author(s) : Deepak Bandyopadhyay, Lutz Kettner +// +// Standard streambuf implementation following Nicolai Josuttis, "The +// Standard C++ Library". +// ============================================================================ + +#include +#include +#include // for memcpy + +#ifdef GZSTREAM_NAMESPACE +namespace GZSTREAM_NAMESPACE { +#endif + +// ---------------------------------------------------------------------------- +// Internal classes to implement gzstream. See header file for user classes. +// ---------------------------------------------------------------------------- + +// -------------------------------------- +// class gzstreambuf: +// -------------------------------------- + +gzstreambuf* gzstreambuf::open( const char* name, int open_mode) { + if ( is_open()) + return (gzstreambuf*)0; + mode = open_mode; + // no append nor read/write mode + if ((mode & std::ios::ate) || (mode & std::ios::app) + || ((mode & std::ios::in) && (mode & std::ios::out))) + return (gzstreambuf*)0; + char fmode[10]; + char* fmodeptr = fmode; + if ( mode & std::ios::in) + *fmodeptr++ = 'r'; + else if ( mode & std::ios::out) + *fmodeptr++ = 'w'; + *fmodeptr++ = 'b'; + *fmodeptr = '\0'; + file = gzopen( name, fmode); + if (file == 0) + return (gzstreambuf*)0; + opened = 1; + return this; +} + +gzstreambuf * gzstreambuf::close() { + if ( is_open()) { + sync(); + opened = 0; + if ( gzclose( file) == Z_OK) + return this; + } + return (gzstreambuf*)0; +} + +int gzstreambuf::underflow() { // used for input buffer only + if ( gptr() && ( gptr() < egptr())) + return * reinterpret_cast( gptr()); + + if ( ! (mode & std::ios::in) || ! opened) + return EOF; + // Josuttis' implementation of inbuf + int n_putback = gptr() - eback(); + if ( n_putback > 4) + n_putback = 4; + memcpy( buffer + (4 - n_putback), gptr() - n_putback, n_putback); + + int num = gzread( file, buffer+4, bufferSize-4); + if (num <= 0) // ERROR or EOF + return EOF; + + // reset buffer pointers + setg( buffer + (4 - n_putback), // beginning of putback area + buffer + 4, // read position + buffer + 4 + num); // end of buffer + + // return next character + return * reinterpret_cast( gptr()); +} + +int gzstreambuf::flush_buffer() { + // Separate the writing of the buffer from overflow() and + // sync() operation. + int w = pptr() - pbase(); + if ( gzwrite( file, pbase(), w) != w) + return EOF; + pbump( -w); + return w; +} + +int gzstreambuf::overflow( int c) { // used for output buffer only + if ( ! ( mode & std::ios::out) || ! opened) + return EOF; + if (c != EOF) { + *pptr() = c; + pbump(1); + } + if ( flush_buffer() == EOF) + return EOF; + return c; +} + +int gzstreambuf::sync() { + // Changed to use flush_buffer() instead of overflow( EOF) + // which caused improper behavior with std::endl and flush(), + // bug reported by Vincent Ricard. + if ( pptr() && pptr() > pbase()) { + if ( flush_buffer() == EOF) + return -1; + } + return 0; +} + +// -------------------------------------- +// class gzstreambase: +// -------------------------------------- + +gzstreambase::gzstreambase( const char* name, int mode) { + init( &buf); + open( name, mode); +} + +gzstreambase::~gzstreambase() { + buf.close(); +} + +void gzstreambase::open( const char* name, int open_mode) { + if ( ! buf.open( name, open_mode)) + clear( rdstate() | std::ios::badbit); +} + +void gzstreambase::close() { + if ( buf.is_open()) + if ( ! buf.close()) + clear( rdstate() | std::ios::badbit); +} + +#ifdef GZSTREAM_NAMESPACE +} // namespace GZSTREAM_NAMESPACE +#endif + +// ============================================================================ +// EOF // diff --git a/src/support/gzstream.h b/src/support/gzstream.h new file mode 100644 index 0000000000..0d7b6cb03a --- /dev/null +++ b/src/support/gzstream.h @@ -0,0 +1,123 @@ +// ============================================================================ +// gzstream, C++ iostream classes wrapping the zlib compression library. +// Copyright (C) 2001 Deepak Bandyopadhyay, Lutz Kettner +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// ============================================================================ +// +// File : gzstream.h +// Revision : $Revision: 1.1 $ +// Revision_date : $Date: 2003/07/27 23:40:08 $ +// Author(s) : Deepak Bandyopadhyay, Lutz Kettner +// +// Standard streambuf implementation following Nicolai Josuttis, "The +// Standard C++ Library". +// ============================================================================ + +#ifndef GZSTREAM_H +#define GZSTREAM_H 1 + +// standard C++ with new header file names and std:: namespace +#include +#include +#include + +// For LyX +#define GZSTREAM_NAMESPACE gz + +#ifdef GZSTREAM_NAMESPACE +namespace GZSTREAM_NAMESPACE { +#endif + +// ---------------------------------------------------------------------------- +// Internal classes to implement gzstream. See below for user classes. +// ---------------------------------------------------------------------------- + +class gzstreambuf : public std::streambuf { +private: + static const int bufferSize = 47+256; // size of data buff + // totals 512 bytes under g++ for igzstream at the end. + + gzFile file; // file handle for compressed file + char buffer[bufferSize]; // data buffer + char opened; // open/close state of stream + int mode; // I/O mode + + int flush_buffer(); +public: + gzstreambuf() : opened(0) { + setp( buffer, buffer + (bufferSize-1)); + setg( buffer + 4, // beginning of putback area + buffer + 4, // read position + buffer + 4); // end position + // ASSERT: both input & output capabilities will not be used together + } + int is_open() { return opened; } + gzstreambuf* open( const char* name, int open_mode); + gzstreambuf* close(); + ~gzstreambuf() { close(); } + + virtual int overflow( int c = EOF); + virtual int underflow(); + virtual int sync(); +}; + +class gzstreambase : virtual public std::ios { +protected: + gzstreambuf buf; +public: + gzstreambase() { init(&buf); } + gzstreambase( const char* name, int open_mode); + ~gzstreambase(); + void open( const char* name, int open_mode); + void close(); + gzstreambuf* rdbuf() { return &buf; } +}; + +// ---------------------------------------------------------------------------- +// User classes. Use igzstream and ogzstream analogously to ifstream and +// ofstream respectively. They read and write files based on the gz* +// function interface of the zlib. Files are compatible with gzip compression. +// ---------------------------------------------------------------------------- + +class igzstream : public gzstreambase, public std::istream { +public: + igzstream() : std::istream( &buf) {} + igzstream( const char* name, int open_mode = std::ios::in) + : gzstreambase( name, open_mode), std::istream( &buf) {} + gzstreambuf* rdbuf() { return gzstreambase::rdbuf(); } + void open( const char* name, int open_mode = std::ios::in) { + gzstreambase::open( name, open_mode); + } +}; + +class ogzstream : public gzstreambase, public std::ostream { +public: + ogzstream() : std::ostream( &buf) {} + ogzstream( const char* name, int mode = std::ios::out) + : gzstreambase( name, mode), std::ostream( &buf) {} + gzstreambuf* rdbuf() { return gzstreambase::rdbuf(); } + void open( const char* name, int open_mode = std::ios::out) { + gzstreambase::open( name, open_mode); + } +}; + +#ifdef GZSTREAM_NAMESPACE +} // namespace GZSTREAM_NAMESPACE +#endif + +#endif // GZSTREAM_H +// ============================================================================ +// EOF // diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 5896615b9e..2a9db8313c 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -42,9 +42,9 @@ tex2lyx_SOURCES = \ tex2lyx_LDADD = \ ../support/libsupport.la \ - ../../boost/libs/regex/src/libboostregex.la + ../../boost/libs/regex/src/libboostregex.la -lz -FloatList.C: link_files +FloatList.C: link_files link_files: for i in $(linked_files); do \