octave-nkf: src/file-io.cc comparison

comparison src/file-io.cc @ 5325:ecbe4aa87e51

[project @ 2005-04-29 20:48:35 by jwe]

author	jwe
date	Fri, 29 Apr 2005 20:48:36 +0000
parents	7b95f7fdf175
children	ac8d64b9e76a

comparison

equal deleted inserted replaced

-:d2d11284528e
+:ecbe4aa87e51
 #ifdef HAVE_UNISTD_H
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #include <unistd.h>
+#endif
+#ifdef HAVE_ZLIB_H
+#include <zlib.h>
 #endif
 #include "error.h"
 #include "file-ops.h"
 #include "lo-ieee.h"
 unlink (filename.c_str ());
 }
 }
 static std::ios::openmode
-fopen_mode_to_ios_mode (const std::string& mode)
+fopen_mode_to_ios_mode (const std::string& mode_arg)
 {
 std::ios::openmode retval = std::ios::in;
-if (! mode.empty ())
+if (! mode_arg.empty ())
 {
 // Could probably be faster, but does it really matter?
-if (mode == "rt")
+std::string mode = mode_arg;
-	retval = std::ios::in;
-else if (mode == "wt")
+size_t pos = mode.find ('z');
-	retval = std::ios::out | std::ios::trunc;
-else if (mode == "at")
+if (pos != NPOS)
-	retval = std::ios::out | std::ios::app;
+	{
-else if (mode == "r+t")
+#if defined (HAVE_ZLIB)
-	retval = std::ios::in | std::ios::out;
+	  mode.erase (pos, 1);
-else if (mode == "w+t")
+#else
-	retval = std::ios::in | std::ios::out | std::ios::trunc;
+	  error ("this version of Octave does not support gzipped files");
-else if (mode == "a+t")
+#endif
-	retval = std::ios::in | std::ios::out | std::ios::ate;
+	}
-else if (mode == "rb" || mode == "r")
-	retval = std::ios::in | std::ios::binary;
+if (! error_state)
-else if (mode == "wb" || mode == "w")
+	{
-	retval = std::ios::out | std::ios::trunc | std::ios::binary;
+	  if (mode == "rt")
-else if (mode == "ab" || mode == "a")
+	    retval = std::ios::in;
-	retval = std::ios::out | std::ios::app | std::ios::binary;
+	  else if (mode == "wt")
-else if (mode == "r+b" || mode == "r+")
+	    retval = std::ios::out | std::ios::trunc;
-	retval = std::ios::in | std::ios::out | std::ios::binary;
+	  else if (mode == "at")
-else if (mode == "w+b" || mode == "w+")
+	    retval = std::ios::out | std::ios::app;
-	retval = (std::ios::in | std::ios::out | std::ios::trunc
+	  else if (mode == "r+t")
-		  | std::ios::binary);
+	    retval = std::ios::in | std::ios::out;
-else if (mode == "a+b" || mode == "a+")
+	  else if (mode == "w+t")
-	retval = (std::ios::in | std::ios::out | std::ios::ate
+	    retval = std::ios::in | std::ios::out | std::ios::trunc;
-		  | std::ios::binary);
+	  else if (mode == "a+t")
-else
+	    retval = std::ios::in | std::ios::out | std::ios::ate;
-	::error ("invalid mode specified");
+	  else if (mode == "rb" || mode == "r")
+	    retval = std::ios::in | std::ios::binary;
+	  else if (mode == "wb" || mode == "w")
+	    retval = std::ios::out | std::ios::trunc | std::ios::binary;
+	  else if (mode == "ab" || mode == "a")
+	    retval = std::ios::out | std::ios::app | std::ios::binary;
+	  else if (mode == "r+b" || mode == "r+")
+	    retval = std::ios::in | std::ios::out | std::ios::binary;
+	  else if (mode == "w+b" || mode == "w+")
+	    retval = (std::ios::in | std::ios::out | std::ios::trunc
+		      | std::ios::binary);
+	  else if (mode == "a+b" || mode == "a+")
+	    retval = (std::ios::in | std::ios::out | std::ios::ate
+		      | std::ios::binary);
+	  else
+	    ::error ("invalid mode specified");
+	}
 }
 return retval;
 }
 oct_mach_info::float_format flt_fmt =
 	oct_mach_info::string_to_float_format (arch);
 if (! error_state)
 	{
-	  FILE *fptr = ::fopen (name.c_str (), mode.c_str ());
+#if defined (HAVE_ZLIB)
+	  std::string tmode = mode;
-	  retval = octave_stdiostream::create (name, fptr, md, flt_fmt);
+	  size_t pos = tmode.find ('z');
-	  if (! fptr)
-	    {
+	  if (pos != NPOS)
-	      using namespace std;
+	    {
-	      retval.error (::strerror (errno));
+	      tmode.erase (pos, 1);
-	    }
+	      gzFile fptr = ::gzopen (name.c_str (), tmode.c_str ());
+	      if (fptr)
+		retval = octave_zstdiostream::create (name, fptr, md, flt_fmt);
+	      else
+		{
+		  using namespace std;
+		  retval.error (::strerror (errno));
+		}
+	    }
+	  else
+#endif
+	    {
+	      FILE *fptr = ::fopen (name.c_str (), mode.c_str ());
+	      if (fptr)
+		retval = octave_stdiostream::create (name, fptr, md, flt_fmt);
+	      else
+		{
+		  using namespace std;
+		  retval.error (::strerror (errno));
+		}
+	    }
 	}
 }
 return retval;
 }
 \"b\" to open in binary mode.  On Windows and Macintosh systems, text\n\
 mode reading and writing automatically converts linefeeds to the\n\
 appropriate line end character for the system (carriage-return linefeed\n\
 on Windows, carriage-returnn on Macintosh).  The default if no mode is\n\
 specified is binary mode.\n\
+\n\
+Additionally, you may append a \"z\" to the mode string to open a\n\
+gzipped file for reading or writing.  For this to be successful, you\n\
+must also open the file in binary mode.\n\
 \n\
 The parameter @var{arch} is a string specifying the default data format\n\
 for the file.  Valid values for @var{arch} are:\n\
 \n\
 @table @asis\n\

Mercurial > octave-nkf

comparison src/file-io.cc @ 5325:ecbe4aa87e51