Mercurial > octave-nkf
view libinterp/corefcn/oct-iostrm.h @ 18518:0bdecd41b2dd stable
correctly size fread result (bug #41648)
* oct-stream.cc (octave_base_stream::read): When reading to EOF, don't
add extra column to the result matrix if the number of elements found
is an exact multiple of the number of rows requested.
Avoid mixed signed/unsigned comparisons.
* io.tst: New tests.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 22 Feb 2014 13:06:18 -0500 |
parents | ebb3ef964372 |
children | 9ac2357f19bc |
line wrap: on
line source
/* Copyright (C) 1996-2013 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave 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 General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_oct_iostrm_h) #define octave_oct_iostrm_h 1 #include <iosfwd> #include "oct-stream.h" class octave_base_iostream : public octave_base_stream { public: octave_base_iostream (const std::string& n = std::string (), std::ios::openmode m = std::ios::in|std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format ()) : octave_base_stream (m, ff), nm (n) { } // Position a stream at OFFSET relative to ORIGIN. int seek (off_t offset, int origin); // Return current stream position. off_t tell (void); // Return non-zero if EOF has been reached on this stream. bool eof (void) const; // The name of the file. std::string name (void) const { return nm; } protected: ~octave_base_iostream (void) { } void invalid_operation (void) const; private: std::string nm; virtual const char *stream_type (void) const = 0; // No copying! octave_base_iostream (const octave_base_iostream&); octave_base_iostream& operator = (const octave_base_iostream&); }; class octave_istream : public octave_base_iostream { public: octave_istream (std::istream *arg = 0, const std::string& n = std::string ()) : octave_base_iostream (n, std::ios::in, oct_mach_info::native_float_format ()), is (arg) { } static octave_stream create (std::istream *arg = 0, const std::string& n = std::string ()); // Return non-zero if EOF has been reached on this stream. bool eof (void) const; std::istream *input_stream (void) { return is; } std::ostream *output_stream (void) { return 0; } protected: ~octave_istream (void) { } private: std::istream *is; const char *stream_type (void) const { return "octave_istream"; } // No copying! octave_istream (const octave_istream&); octave_istream& operator = (const octave_istream&); }; class octave_ostream : public octave_base_iostream { public: octave_ostream (std::ostream *arg, const std::string& n = std::string ()) : octave_base_iostream (n, std::ios::out, oct_mach_info::native_float_format ()), os (arg) { } static octave_stream create (std::ostream *arg, const std::string& n = std::string ()); // Return non-zero if EOF has been reached on this stream. bool eof (void) const; std::istream *input_stream (void) { return 0; } std::ostream *output_stream (void) { return os; } protected: ~octave_ostream (void) { } private: std::ostream *os; const char *stream_type (void) const { return "octave_ostream"; } // No copying! octave_ostream (const octave_ostream&); octave_ostream& operator = (const octave_ostream&); }; #endif