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

comparison src/file-io.cc @ 10315:57a59eae83cc

untabify src C++ source files

author	John W. Eaton <jwe@octave.org>
date	Thu, 11 Feb 2010 12:41:46 -0500
parents	65b41bc71f09
children	12884915a8e4

comparison

equal deleted inserted replaced

-:07ebe522dac2
+:57a59eae83cc
 // but we don't know precisely what action that implies.
 size_t pos = mode.find ('W');
 if (pos != std::string::npos)
-	{
+{
-	  warning ("fopen: treating mode \"W\" as equivalent to \"w\"");
+warning ("fopen: treating mode \"W\" as equivalent to \"w\"");
-	  mode[pos] = 'w';
+mode[pos] = 'w';
-	}
+}
 pos = mode.find ('R');
 if (pos != std::string::npos)
-	{
+{
-	  warning ("fopen: treating mode \"R\" as equivalent to \"r\"");
+warning ("fopen: treating mode \"R\" as equivalent to \"r\"");
-	  mode[pos] = 'r';
+mode[pos] = 'r';
-	}
+}
 pos = mode.find ('z');
 if (pos != std::string::npos)
-	{
+{
 #if defined (HAVE_ZLIB)
-	  mode.erase (pos, 1);
+mode.erase (pos, 1);
 #else
-	  error ("this version of Octave does not support gzipped files");
+error ("this version of Octave does not support gzipped files");
 #endif
-	}
+}
 if (! error_state)
-	{
+{
-	  if (mode == "rt")
+if (mode == "rt")
-	    retval = std::ios::in;
+retval = std::ios::in;
-	  else if (mode == "wt")
+else if (mode == "wt")
-	    retval = std::ios::out | std::ios::trunc;
+retval = std::ios::out | std::ios::trunc;
-	  else if (mode == "at")
+else if (mode == "at")
-	    retval = std::ios::out | std::ios::app;
+retval = std::ios::out | std::ios::app;
-	  else if (mode == "r+t" || mode == "rt+")
+else if (mode == "r+t" || mode == "rt+")
-	    retval = std::ios::in | std::ios::out;
+retval = std::ios::in | std::ios::out;
-	  else if (mode == "w+t" || mode == "wt+")
+else if (mode == "w+t" || mode == "wt+")
-	    retval = std::ios::in | std::ios::out | std::ios::trunc;
+retval = std::ios::in | std::ios::out | std::ios::trunc;
-	  else if (mode == "a+t" || mode == "at+")
+else if (mode == "a+t" || mode == "at+")
-	    retval = std::ios::in | std::ios::out | std::ios::app;
+retval = std::ios::in | std::ios::out | std::ios::app;
-	  else if (mode == "rb" || mode == "r")
+else if (mode == "rb" || mode == "r")
-	    retval = std::ios::in | std::ios::binary;
+retval = std::ios::in | std::ios::binary;
-	  else if (mode == "wb" || mode == "w")
+else if (mode == "wb" || mode == "w")
-	    retval = std::ios::out | std::ios::trunc | std::ios::binary;
+retval = std::ios::out | std::ios::trunc | std::ios::binary;
-	  else if (mode == "ab" || mode == "a")
+else if (mode == "ab" || mode == "a")
-	    retval = std::ios::out | std::ios::app | std::ios::binary;
+retval = std::ios::out | std::ios::app | std::ios::binary;
-	  else if (mode == "r+b" || mode == "rb+" || mode == "r+")
+else if (mode == "r+b" || mode == "rb+" || mode == "r+")
-	    retval = std::ios::in | std::ios::out | std::ios::binary;
+retval = std::ios::in | std::ios::out | std::ios::binary;
-	  else if (mode == "w+b" || mode == "wb+" || mode == "w+")
+else if (mode == "w+b" || mode == "wb+" || mode == "w+")
-	    retval = (std::ios::in | std::ios::out | std::ios::trunc
+retval = (std::ios::in | std::ios::out | std::ios::trunc
-		      | std::ios::binary);
+| std::ios::binary);
-	  else if (mode == "a+b" || mode == "ab+" || mode == "a+")
+else if (mode == "a+b" || mode == "ab+" || mode == "a+")
-	    retval = (std::ios::in | std::ios::out | std::ios::app
+retval = (std::ios::in | std::ios::out | std::ios::app
-		      | std::ios::binary);
+| std::ios::binary);
-	  else
+else
-	    ::error ("invalid mode specified");
+::error ("invalid mode specified");
-	}
+}
 }
 return retval;
 }
 int fid = octave_stream_list::get_file_number (args (0));
 octave_stream os = octave_stream_list::lookup (fid, "fclear");
 if (! error_state)
-	os.clearerr ();
+os.clearerr ();
 }
 else
 print_usage ();
 return retval;
 // FIXME -- any way to avoid special case for stdout?
 int fid = octave_stream_list::get_file_number (args (0));
 if (fid == 1)
-	{
+{
-	  flush_octave_stdout ();
+flush_octave_stdout ();
-	  retval = 0;
+retval = 0;
-	}
+}
 else
-	{
+{
-	  octave_stream os = octave_stream_list::lookup (fid, "fflush");
+octave_stream os = octave_stream_list::lookup (fid, "fflush");
-	  if (! error_state)
+if (! error_state)
-	    retval = os.flush ();
+retval = os.flush ();
-	}
+}
 }
 else
 print_usage ();
 return retval;
 if (nargin == 1 || nargin == 2)
 {
 octave_stream os = octave_stream_list::lookup (args(0), who);
 if (! error_state)
-	{
+{
-	  octave_value len_arg = (nargin == 2) ? args(1) : octave_value ();
+octave_value len_arg = (nargin == 2) ? args(1) : octave_value ();
-	  bool err = false;
+bool err = false;
-	  std::string tmp = os.getl (len_arg, err, who);
+std::string tmp = os.getl (len_arg, err, who);
-	  if (! (error_state || err))
+if (! (error_state || err))
-	    {
+{
-	      retval(1) = tmp.length ();
+retval(1) = tmp.length ();
-	      retval(0) = tmp;
+retval(0) = tmp;
-	    }
+}
-	}
+}
 }
 else
 print_usage ();
 return retval;
 if (nargin == 1 || nargin == 2)
 {
 octave_stream os = octave_stream_list::lookup (args(0), who);
 if (! error_state)
-	{
+{
-	  octave_value len_arg = (nargin == 2) ? args(1) : octave_value ();
+octave_value len_arg = (nargin == 2) ? args(1) : octave_value ();
-	  bool err = false;
+bool err = false;
-	  std::string tmp = os.gets (len_arg, err, who);
+std::string tmp = os.gets (len_arg, err, who);
-	  if (! (error_state || err))
+if (! (error_state || err))
-	    {
+{
-	      retval(1) = tmp.length ();
+retval(1) = tmp.length ();
-	      retval(0) = tmp;
+retval(0) = tmp;
-	    }
+}
-	}
+}
 }
 else
 print_usage ();
 return retval;
 if (nargin == 1 || nargin == 2)
 {
 octave_stream os = octave_stream_list::lookup (args(0), who);
 if (! error_state)
-	{
+{
-	  octave_value count_arg = (nargin == 2) ? args(1) : octave_value ();
+octave_value count_arg = (nargin == 2) ? args(1) : octave_value ();
-	  bool err = false;
+bool err = false;
-	  long tmp = os.skipl (count_arg, err, who);
+long tmp = os.skipl (count_arg, err, who);
-	  if (! (error_state || err))
+if (! (error_state || err))
 retval = tmp;
-	}
+}
 }
 else
 print_usage ();
 return retval;
 }
 static octave_stream
 do_stream_open (const std::string& name, const std::string& mode,
-		const std::string& arch, int& fid)
+const std::string& arch, int& fid)
 {
 octave_stream retval;
 fid = -1;
 std::ios::openmode md = fopen_mode_to_ios_mode (mode);
 if (! error_state)
 {
 oct_mach_info::float_format flt_fmt =
-	oct_mach_info::string_to_float_format (arch);
+oct_mach_info::string_to_float_format (arch);
 if (! error_state)
-	{
+{
-	  std::string fname = file_ops::tilde_expand (name);
+std::string fname = file_ops::tilde_expand (name);
-	  file_stat fs (fname);
+file_stat fs (fname);
-	  if (! (md & std::ios::out
+if (! (md & std::ios::out
-		 || octave_env::absolute_pathname (fname)
+|| octave_env::absolute_pathname (fname)
-		 || octave_env::rooted_relative_pathname (fname)))
+|| octave_env::rooted_relative_pathname (fname)))
-	    {
+{
-	      if (! fs.exists ())
+if (! fs.exists ())
-		{
+{
-		  std::string tmp
+std::string tmp
 = octave_env::make_absolute (load_path::find_file (fname));
-		  if (! tmp.empty ())
+if (! tmp.empty ())
-		    {
+{
-		      warning_with_id ("Octave:fopen-file-in-path",
+warning_with_id ("Octave:fopen-file-in-path",
-				       "fopen: file found in load path");
+"fopen: file found in load path");
-		      fname = tmp;
+fname = tmp;
-		    }
+}
-		}
+}
-	    }
+}
-	  if (! fs.is_dir ())
+if (! fs.is_dir ())
-	    {
+{
-	      std::string tmode = mode;
+std::string tmode = mode;
-	      // Use binary mode if 't' is not specified, but don't add
+// Use binary mode if 't' is not specified, but don't add
-	      // 'b' if it is already present.
+// 'b' if it is already present.
-	      size_t bpos = tmode.find ('b');
+size_t bpos = tmode.find ('b');
-	      size_t tpos = tmode.find ('t');
+size_t tpos = tmode.find ('t');
-	      if (bpos == std::string::npos && tpos == std::string::npos)
+if (bpos == std::string::npos && tpos == std::string::npos)
-		tmode += 'b';
+tmode += 'b';
 #if defined (HAVE_ZLIB)
-	      size_t pos = tmode.find ('z');
+size_t pos = tmode.find ('z');
-	      if (pos != std::string::npos)
+if (pos != std::string::npos)
-		{
+{
-		  tmode.erase (pos, 1);
+tmode.erase (pos, 1);
-		  gzFile fptr = ::gzopen (fname.c_str (), tmode.c_str ());
+gzFile fptr = ::gzopen (fname.c_str (), tmode.c_str ());
-		  if (fptr)
+if (fptr)
-		    retval = octave_zstdiostream::create (fname, fptr, md, flt_fmt);
+retval = octave_zstdiostream::create (fname, fptr, md, flt_fmt);
-		  else
+else
-		    {
+{
-		      using namespace std;
+using namespace std;
-		      retval.error (::strerror (errno));
+retval.error (::strerror (errno));
-		    }
+}
-		}
+}
-	      else
+else
 #endif
-		{
+{
-		  FILE *fptr = ::fopen (fname.c_str (), tmode.c_str ());
+FILE *fptr = ::fopen (fname.c_str (), tmode.c_str ());
-		  retval = octave_stdiostream::create (fname, fptr, md, flt_fmt);
+retval = octave_stdiostream::create (fname, fptr, md, flt_fmt);
-		  if (! fptr)
+if (! fptr)
-		    {
+{
-		      using namespace std;
+using namespace std;
-		      retval.error (::strerror (errno));
+retval.error (::strerror (errno));
-		    }
+}
-		}
+}
-	    }
+}
-	}
+}
 }
 return retval;
 }
 static octave_stream
 do_stream_open (const octave_value& tc_name, const octave_value& tc_mode,
-		const octave_value& tc_arch, const char *fcn, int& fid)
+const octave_value& tc_arch, const char *fcn, int& fid)
 {
 octave_stream retval;
 fid = -1;
 if (! error_state)
 {
 std::string mode = tc_mode.string_value ();
 if (! error_state)
-	{
+{
-	  std::string arch = tc_arch.string_value ();
+std::string arch = tc_arch.string_value ();
-	  if (! error_state)
+if (! error_state)
-	    retval = do_stream_open (name, mode, arch, fid);
+retval = do_stream_open (name, mode, arch, fid);
-	  else
+else
-	    ::error ("%s: architecture type must be a string", fcn);
+::error ("%s: architecture type must be a string", fcn);
-	}
+}
 else
-	::error ("%s: file mode must be a string", fcn);
+::error ("%s: file mode must be a string", fcn);
 }
 else
 ::error ("%s: file name must be a string", fcn);
 return retval;
 int nargin = args.length ();
 if (nargin == 1)
 {
 if (args(0).is_string ())
-	{
+{
-	  // If there is only one argument and it is a string but it
+// If there is only one argument and it is a string but it
-	  // is not the string "all", we assume it is a file to open
+// is not the string "all", we assume it is a file to open
-	  // with MODE = "r".  To open a file called "all", you have
+// with MODE = "r".  To open a file called "all", you have
-	  // to supply more than one argument.
+// to supply more than one argument.
-	  if (args(0).string_value () == "all")
+if (args(0).string_value () == "all")
-	    return octave_stream_list::open_file_numbers ();
+return octave_stream_list::open_file_numbers ();
-	}
+}
 else
-	{
+{
-	  string_vector tmp = octave_stream_list::get_info (args(0));
+string_vector tmp = octave_stream_list::get_info (args(0));
-	  if (! error_state)
+if (! error_state)
-	    {
+{
-	      retval(2) = tmp(2);
+retval(2) = tmp(2);
-	      retval(1) = tmp(1);
+retval(1) = tmp(1);
-	      retval(0) = tmp(0);
+retval(0) = tmp(0);
-	    }
+}
-	  return retval;
+return retval;
-	}
+}
 }
 if (nargin > 0 && nargin < 4)
 {
 octave_value mode = (nargin == 2 || nargin == 3)
-	? args(1) : octave_value ("r");
+? args(1) : octave_value ("r");
 octave_value arch = (nargin == 3)
-	? args(2) : octave_value ("native");
+? args(2) : octave_value ("native");
 int fid = -1;
 octave_stream os = do_stream_open (args(0), mode, arch, "fopen", fid);
 if (os && ! error_state)
-	{
+{
-	  retval(1) = "";
+retval(1) = "";
-	  retval(0) = octave_stream_list::insert (os);
+retval(0) = octave_stream_list::insert (os);
-	}
+}
 else
-	{
+{
-	  int error_number = 0;
+int error_number = 0;
-	  retval(1) = os.error (false, error_number);
+retval(1) = os.error (false, error_number);
-	  retval(0) = -1.0;
+retval(0) = -1.0;
-	}
+}
 }
 else
 print_usage ();
 return retval;
 if (nargin == 1)
 {
 octave_stream os = octave_stream_list::lookup (args(0), "frewind");
 if (! error_state)
-	result = os.rewind ();
+result = os.rewind ();
 }
 else
 print_usage ();
 if (nargout > 0)
 if (nargin == 2 || nargin == 3)
 {
 octave_stream os = octave_stream_list::lookup (args(0), "fseek");
 if (! error_state)
-	{
+{
-	  octave_value origin_arg = (nargin == 3)
+octave_value origin_arg = (nargin == 3)
-	    ? args(2) : octave_value (-1.0);
+? args(2) : octave_value (-1.0);
-	  retval = os.seek (args(1), origin_arg);
+retval = os.seek (args(1), origin_arg);
-	}
+}
 }
 else
 print_usage ();
 return retval;
 if (nargin == 1)
 {
 octave_stream os = octave_stream_list::lookup (args(0), "ftell");
 if (! error_state)
-	retval = os.tell ();
+retval = os.tell ();
 }
 else
 print_usage ();
 return retval;
 {
 octave_stream os;
 int fmt_n = 0;
 if (args(0).is_string ())
-	{
+{
-	  os = octave_stream_list::lookup (1, who);
+os = octave_stream_list::lookup (1, who);
-	}
+}
 else
-	{
+{
-	  fmt_n = 1;
+fmt_n = 1;
-	  os = octave_stream_list::lookup (args(0), who);
+os = octave_stream_list::lookup (args(0), who);
-	}
+}
 if (! error_state)
-	{
+{
-	  if (args(fmt_n).is_string ())
+if (args(fmt_n).is_string ())
-	    {
+{
-	      octave_value_list tmp_args;
+octave_value_list tmp_args;
-	      if (nargin > 1 + fmt_n)
+if (nargin > 1 + fmt_n)
-		{
+{
-		  tmp_args.resize (nargin-fmt_n-1, octave_value ());
+tmp_args.resize (nargin-fmt_n-1, octave_value ());
-		  for (int i = fmt_n + 1; i < nargin; i++)
+for (int i = fmt_n + 1; i < nargin; i++)
-		    tmp_args(i-fmt_n-1) = args(i);
+tmp_args(i-fmt_n-1) = args(i);
-		}
+}
-	      result = os.printf (args(fmt_n), tmp_args, who);
+result = os.printf (args(fmt_n), tmp_args, who);
-	    }
+}
-	  else
+else
-	    ::error ("%s: format must be a string", who.c_str ());
+::error ("%s: format must be a string", who.c_str ());
-	}
+}
 }
 else
 print_usage ();
 if (nargout > 0)
 int nargin = args.length ();
 if (nargin > 0)
 {
 if (args(0).is_string ())
-	{
+{
-	  octave_value_list tmp_args;
+octave_value_list tmp_args;
-	  if (nargin > 1)
+if (nargin > 1)
-	    {
+{
-	      tmp_args.resize (nargin-1, octave_value ());
+tmp_args.resize (nargin-1, octave_value ());
-	      for (int i = 1; i < nargin; i++)
+for (int i = 1; i < nargin; i++)
-		tmp_args(i-1) = args(i);
+tmp_args(i-1) = args(i);
-	    }
+}
-	  result = stdout_stream.printf (args(0), tmp_args, who);
+result = stdout_stream.printf (args(0), tmp_args, who);
-	}
+}
 else
-	::error ("%s: format must be a string", who.c_str ());
+::error ("%s: format must be a string", who.c_str ());
 }
 else
 print_usage ();
 if (nargout > 0)
 if (nargin == 2)
 {
 octave_stream os = octave_stream_list::lookup (args(0), who);
 if (! error_state)
-	retval = os.puts (args(1), who);
+retval = os.puts (args(1), who);
 }
 else
 print_usage ();
 return retval;
 octave_ostrstream *ostr = new octave_ostrstream ();
 octave_stream os (ostr);
 if (os.is_valid ())
-	{
+{
-	  octave_value fmt_arg = args(0);
+octave_value fmt_arg = args(0);
-	  if (fmt_arg.is_string ())
+if (fmt_arg.is_string ())
-	    {
+{
-	      octave_value_list tmp_args;
+octave_value_list tmp_args;
-	      if (nargin > 1)
+if (nargin > 1)
-		{
+{
-		  tmp_args.resize (nargin-1, octave_value ());
+tmp_args.resize (nargin-1, octave_value ());
-		  for (int i = 1; i < nargin; i++)
+for (int i = 1; i < nargin; i++)
-		    tmp_args(i-1) = args(i);
+tmp_args(i-1) = args(i);
-		}
+}
-	      retval(2) = os.printf (fmt_arg, tmp_args, who);
+retval(2) = os.printf (fmt_arg, tmp_args, who);
-	      retval(1) = os.error ();
+retval(1) = os.error ();
-	      retval(0) = octave_value (ostr->str (),
+retval(0) = octave_value (ostr->str (),
-					fmt_arg.is_sq_string () ? '\'' : '"');
+fmt_arg.is_sq_string () ? '\'' : '"');
-	    }
+}
-	  else
+else
-	    ::error ("%s: format must be a string", who.c_str ());
+::error ("%s: format must be a string", who.c_str ());
-	}
+}
 else
-	::error ("%s: unable to create output buffer", who.c_str ());
+::error ("%s: unable to create output buffer", who.c_str ());
 }
 else
 print_usage ();
 return retval;
 if (nargin == 3 && args(2).is_string ())
 {
 octave_stream os = octave_stream_list::lookup (args(0), who);
 if (! error_state)
-	{
+{
-	  if (args(1).is_string ())
+if (args(1).is_string ())
-	    retval = os.oscanf (args(1), who);
+retval = os.oscanf (args(1), who);
-	  else
+else
-	    ::error ("%s: format must be a string", who.c_str ());
+::error ("%s: format must be a string", who.c_str ());
-	}
+}
 }
 else
 {
 retval (1) = 0.0;
 retval (0) = Matrix ();
 if (nargin == 2 || nargin == 3)
-	{
+{
-	  octave_stream os = octave_stream_list::lookup (args(0), who);
+octave_stream os = octave_stream_list::lookup (args(0), who);
-	  if (! error_state)
+if (! error_state)
-	    {
+{
-	      if (args(1).is_string ())
+if (args(1).is_string ())
-		{
+{
-		  octave_idx_type count = 0;
+octave_idx_type count = 0;
-		  Array<double> size = (nargin == 3)
+Array<double> size = (nargin == 3)
-		    ? args(2).vector_value ()
+? args(2).vector_value ()
-		    : Array<double> (1, lo_ieee_inf_value ());
+: Array<double> (1, lo_ieee_inf_value ());
-		  if (! error_state)
+if (! error_state)
-		    {
+{
-		      octave_value tmp = os.scanf (args(1), size, count, who);
+octave_value tmp = os.scanf (args(1), size, count, who);
-		      if (! error_state)
+if (! error_state)
-			{
+{
-			  retval(1) = count;
+retval(1) = count;
-			  retval(0) = tmp;
+retval(0) = tmp;
-			}
+}
-		    }
+}
-		}
+}
-	      else
+else
-		::error ("%s: format must be a string", who.c_str ());
+::error ("%s: format must be a string", who.c_str ());
-	    }
+}
-	}
+}
 else
-	print_usage ();
+print_usage ();
 }
 return retval;
 }
 int nargin = args.length ();
 if (nargin == 3 && args(2).is_string ())
 {
 if (args(0).is_string ())
-	{
+{
-	  std::string data = args(0).string_value ();
+std::string data = args(0).string_value ();
-	  octave_stream os = octave_istrstream::create (data);
+octave_stream os = octave_istrstream::create (data);
-	  if (os.is_valid ())
+if (os.is_valid ())
-	    {
+{
-	      if (args(1).is_string ())
+if (args(1).is_string ())
-		retval = os.oscanf (args(1), who);
+retval = os.oscanf (args(1), who);
-	      else
+else
-		::error ("%s: format must be a string", who.c_str ());
+::error ("%s: format must be a string", who.c_str ());
-	    }
+}
-	  else
+else
-	    ::error ("%s: unable to create temporary input buffer",
+::error ("%s: unable to create temporary input buffer",
-		     who.c_str ());
+who.c_str ());
-	}
+}
 else
-	::error ("%s: first argument must be a string", who.c_str ());
+::error ("%s: first argument must be a string", who.c_str ());
 }
 else
 {
 if (nargin == 2 || nargin == 3)
-	{
+{
-	  retval(3) = -1.0;
+retval(3) = -1.0;
-	  retval(2) = "unknown error";
+retval(2) = "unknown error";
-	  retval(1) = 0.0;
+retval(1) = 0.0;
-	  retval(0) = Matrix ();
+retval(0) = Matrix ();
-	  if (args(0).is_string ())
+if (args(0).is_string ())
-	    {
+{
-	      std::string data = args(0).string_value ();
+std::string data = args(0).string_value ();
-	      octave_stream os = octave_istrstream::create (data);
+octave_stream os = octave_istrstream::create (data);
-	      if (os.is_valid ())
+if (os.is_valid ())
-		{
+{
-		  if (args(1).is_string ())
+if (args(1).is_string ())
-		    {
+{
-		      octave_idx_type count = 0;
+octave_idx_type count = 0;
-		      Array<double> size = (nargin == 3)
+Array<double> size = (nargin == 3)
-			? args(2).vector_value ()
+? args(2).vector_value ()
-			: Array<double> (1, lo_ieee_inf_value ());
+: Array<double> (1, lo_ieee_inf_value ());
-		      octave_value tmp = os.scanf (args(1), size, count, who);
+octave_value tmp = os.scanf (args(1), size, count, who);
-		      if (! error_state)
+if (! error_state)
-			{
+{
-			  // FIXME -- is this the right thing to do?
+// FIXME -- is this the right thing to do?
-			  // Extract error message first, because getting
+// Extract error message first, because getting
-			  // position will clear it.
+// position will clear it.
-			  std::string errmsg = os.error ();
+std::string errmsg = os.error ();
-			  retval(3) = os.tell () + 1;
+retval(3) = os.tell () + 1;
-			  retval(2) = errmsg;
+retval(2) = errmsg;
-			  retval(1) = count;
+retval(1) = count;
-			  retval(0) = tmp;
+retval(0) = tmp;
-			}
+}
-		    }
+}
-		  else
+else
-		    ::error ("%s: format must be a string", who.c_str ());
+::error ("%s: format must be a string", who.c_str ());
-		}
+}
-	      else
+else
-		::error ("%s: unable to create temporary input buffer",
+::error ("%s: unable to create temporary input buffer",
-			 who.c_str  ());
+who.c_str  ());
-	    }
+}
-	  else
+else
-	    ::error ("%s: first argument must be a string", who.c_str ());
+::error ("%s: first argument must be a string", who.c_str ());
-	}
+}
 else
-	print_usage ();
+print_usage ();
 }
 return retval;
 }
 return Ffscanf (tmp_args, nargout);
 }
 static octave_value
 do_fread (octave_stream& os, const octave_value& size_arg,
-	  const octave_value& prec_arg, const octave_value& skip_arg,
+const octave_value& prec_arg, const octave_value& skip_arg,
-	  const octave_value& arch_arg, octave_idx_type& count)
+const octave_value& arch_arg, octave_idx_type& count)
 {
 octave_value retval;
 count = -1;
 if (! error_state)
 {
 std::string prec = prec_arg.string_value ();
 if (! error_state)
-	{
+{
-	  int block_size = 1;
+int block_size = 1;
-	  oct_data_conv::data_type input_type;
+oct_data_conv::data_type input_type;
-	  oct_data_conv::data_type output_type;
+oct_data_conv::data_type output_type;
-	  oct_data_conv::string_to_data_type (prec, block_size,
+oct_data_conv::string_to_data_type (prec, block_size,
-					      input_type, output_type);
+input_type, output_type);
-	  if (! error_state)
+if (! error_state)
-	    {
+{
-	      int skip = skip_arg.int_value (true);
+int skip = skip_arg.int_value (true);
-	      if (! error_state)
+if (! error_state)
-		{
+{
-		  std::string arch = arch_arg.string_value ();
+std::string arch = arch_arg.string_value ();
-		  if (! error_state)
+if (! error_state)
-		    {
+{
-		      oct_mach_info::float_format flt_fmt
+oct_mach_info::float_format flt_fmt
-			= oct_mach_info::string_to_float_format (arch);
+= oct_mach_info::string_to_float_format (arch);
-		      if (! error_state)
+if (! error_state)
-			retval = os.read (size, block_size, input_type,
+retval = os.read (size, block_size, input_type,
-					  output_type, skip, flt_fmt, count);
+output_type, skip, flt_fmt, count);
-		    }
+}
-		  else
+else
-		    ::error ("fread: architecture type must be a string");
+::error ("fread: architecture type must be a string");
-		}
+}
-	      else
+else
-		::error ("fread: skip must be an integer");
+::error ("fread: skip must be an integer");
-	    }
+}
-	  else
+else
-	    ::error ("fread: invalid data type specified");
+::error ("fread: invalid data type specified");
-	}
+}
 else
-	::error ("fread: precision must be a string");
+::error ("fread: precision must be a string");
 }
 else
 ::error ("fread: invalid size specified");
 return retval;
 retval(0) = Matrix ();
 octave_stream os = octave_stream_list::lookup (args(0), "fread");
 if (! error_state)
-	{
+{
-	  octave_value size = lo_ieee_inf_value ();
+octave_value size = lo_ieee_inf_value ();
-	  octave_value prec = "uchar";
+octave_value prec = "uchar";
-	  octave_value skip = 0;
+octave_value skip = 0;
-	  octave_value arch = "unknown";
+octave_value arch = "unknown";
-	  int idx = 1;
+int idx = 1;
-	  if (nargin > idx && ! args(idx).is_string ())
+if (nargin > idx && ! args(idx).is_string ())
-	    size = args(idx++);
+size = args(idx++);
-	  if (nargin > idx)
+if (nargin > idx)
-	    prec = args(idx++);
+prec = args(idx++);
-	  if (nargin > idx)
+if (nargin > idx)
-	    skip = args(idx++);
+skip = args(idx++);
-	  if (nargin > idx)
+if (nargin > idx)
-	    arch = args(idx++);
+arch = args(idx++);
-	  else if (skip.is_string ())
+else if (skip.is_string ())
-	    {
+{
-	      arch = skip;
+arch = skip;
-	      skip = 0;
+skip = 0;
-	    }
+}
-	  octave_idx_type count = -1;
+octave_idx_type count = -1;
-	  octave_value tmp = do_fread (os, size, prec, skip, arch, count);
+octave_value tmp = do_fread (os, size, prec, skip, arch, count);
-	  retval(1) = count;
+retval(1) = count;
-	  retval(0) = tmp;
+retval(0) = tmp;
-	}
+}
 }
 else
 print_usage ();
 return retval;
 }
 static int
 do_fwrite (octave_stream& os, const octave_value& data,
-	   const octave_value& prec_arg, const octave_value& skip_arg,
+const octave_value& prec_arg, const octave_value& skip_arg,
-	   const octave_value& arch_arg)
+const octave_value& arch_arg)
 {
 int retval = -1;
 std::string prec = prec_arg.string_value ();
 oct_data_conv::data_type output_type;
 oct_data_conv::string_to_data_type (prec, block_size, output_type);
 if (! error_state)
-	{
+{
-	  int skip = skip_arg.int_value (true);
+int skip = skip_arg.int_value (true);
-	  if (! error_state)
+if (! error_state)
-	    {
+{
-	      std::string arch = arch_arg.string_value ();
+std::string arch = arch_arg.string_value ();
-	      if (! error_state)
+if (! error_state)
-		{
+{
-		  oct_mach_info::float_format flt_fmt
+oct_mach_info::float_format flt_fmt
-		    = oct_mach_info::string_to_float_format (arch);
+= oct_mach_info::string_to_float_format (arch);
-		  if (! error_state)
+if (! error_state)
-		    retval = os.write (data, block_size, output_type,
+retval = os.write (data, block_size, output_type,
-				       skip, flt_fmt);
+skip, flt_fmt);
-		}
+}
-	      else
+else
-		::error ("fwrite: architecture type must be a string");
+::error ("fwrite: architecture type must be a string");
-	    }
+}
-	  else
+else
-	    ::error ("fwrite: skip must be an integer");
+::error ("fwrite: skip must be an integer");
-	}
+}
 else
-	::error ("fwrite: invalid precision specified");
+::error ("fwrite: invalid precision specified");
 }
 else
 ::error ("fwrite: precision must be a string");
 return retval;
 if (nargin > 1 && nargin < 6)
 {
 octave_stream os = octave_stream_list::lookup (args(0), "fwrite");
 if (! error_state)
-	{
+{
-	  octave_value prec = "uchar";
+octave_value prec = "uchar";
-	  octave_value skip = 0;
+octave_value skip = 0;
-	  octave_value arch = "unknown";
+octave_value arch = "unknown";
-	  int idx = 1;
+int idx = 1;
-	  octave_value data = args(idx++);
+octave_value data = args(idx++);
-	  if (nargin > idx)
+if (nargin > idx)
-	    prec = args(idx++);
+prec = args(idx++);
-	  if (nargin > idx)
+if (nargin > idx)
-	    skip = args(idx++);
+skip = args(idx++);
-	  if (nargin > idx)
+if (nargin > idx)
-	    arch = args(idx++);
+arch = args(idx++);
-	  else if (skip.is_string ())
+else if (skip.is_string ())
-	    {
+{
-	      arch = skip;
+arch = skip;
-	      skip = 0;
+skip = 0;
-	    }
+}
-	  double status = do_fwrite (os, data, prec, skip, arch);
+double status = do_fwrite (os, data, prec, skip, arch);
-	  retval = status;
+retval = status;
-	}
+}
 }
 else
 print_usage ();
 return retval;
 if (nargin == 1)
 {
 octave_stream os = octave_stream_list::lookup (args(0), "feof");
 if (! error_state)
-	retval = os.eof () ? 1.0 : 0.0;
+retval = os.eof () ? 1.0 : 0.0;
 }
 else
 print_usage ();
 return retval;
 if (nargin == 1 || nargin == 2)
 {
 octave_stream os = octave_stream_list::lookup (args(0), "ferror");
 if (! error_state)
-	{
+{
-	  bool clear = false;
+bool clear = false;
-	  if (nargin == 2)
+if (nargin == 2)
-	    {
+{
-	      std::string opt = args(1).string_value ();
+std::string opt = args(1).string_value ();
-	      if (! error_state)
+if (! error_state)
-		clear = (opt == "clear");
+clear = (opt == "clear");
-	      else
+else
-		return retval;
+return retval;
-	    }
+}
-	  int error_number = 0;
+int error_number = 0;
-	  std::string error_message = os.error (clear, error_number);
+std::string error_message = os.error (clear, error_number);
-	  retval(1) = error_number;
+retval(1) = error_number;
-	  retval(0) = error_message;
+retval(0) = error_message;
-	}
+}
 }
 else
 print_usage ();
 return retval;
 if (nargin == 2)
 {
 std::string name = args(0).string_value ();
 if (! error_state)
-	{
+{
-	  std::string mode = args(1).string_value ();
+std::string mode = args(1).string_value ();
-	  if (! error_state)
+if (! error_state)
-	    {
+{
-	      if (mode == "r")
+if (mode == "r")
-		{
+{
-		  octave_stream ips = octave_iprocstream::create (name);
+octave_stream ips = octave_iprocstream::create (name);
-		  retval = octave_stream_list::insert (ips);
+retval = octave_stream_list::insert (ips);
-		}
+}
-	      else if (mode == "w")
+else if (mode == "w")
-		{
+{
-		  octave_stream ops = octave_oprocstream::create (name);
+octave_stream ops = octave_oprocstream::create (name);
-		  retval = octave_stream_list::insert (ops);
+retval = octave_stream_list::insert (ops);
-		}
+}
-	      else
+else
-		::error ("popen: invalid mode specified");
+::error ("popen: invalid mode specified");
-	    }
+}
-	  else
+else
-	    ::error ("popen: mode must be a string");
+::error ("popen: mode must be a string");
-	}
+}
 else
-	::error ("popen: name must be a string");
+::error ("popen: name must be a string");
 }
 else
 print_usage ();
 return retval;
 if (len < 3)
 {
 std::string dir = len > 0 ? args(0).string_value () : std::string ();
 if (! error_state)
-	{
+{
-	  std::string pfx
+std::string pfx
-	    = len > 1 ? args(1).string_value () : std::string ("oct-");
+= len > 1 ? args(1).string_value () : std::string ("oct-");
-	  if (! error_state)
+if (! error_state)
-	    retval = octave_tempnam (dir, pfx);
+retval = octave_tempnam (dir, pfx);
-	  else
+else
-	    ::error ("expecting second argument to be a string");
+::error ("expecting second argument to be a string");
-	}
+}
 else
-	::error ("expecting first argument to be a string");
+::error ("expecting first argument to be a string");
 }
 else
 print_usage ();
 return retval;
 if (nargin == 0)
 {
 FILE *fid = tmpfile ();
 if (fid)
-	{
+{
-	  std::string nm;
+std::string nm;
-	  std::ios::openmode md = fopen_mode_to_ios_mode ("w+b");
+std::ios::openmode md = fopen_mode_to_ios_mode ("w+b");
-	  octave_stream s = octave_stdiostream::create (nm, fid, md);
+octave_stream s = octave_stdiostream::create (nm, fid, md);
-	  if (s)
+if (s)
-	    retval(0) = octave_stream_list::insert (s);
+retval(0) = octave_stream_list::insert (s);
-	  else
+else
-	    error ("tmpfile: failed to create octave_stdiostream object");
+error ("tmpfile: failed to create octave_stdiostream object");
-	}
+}
 else
-	{
+{
-	  using namespace std;
+using namespace std;
-	  retval(1) = ::strerror (errno);
+retval(1) = ::strerror (errno);
-	  retval(0) = -1;
+retval(0) = -1;
-	}
+}
 }
 else
 print_usage ();
 return retval;
 int mkstemp (char *tmpl)
 {
 int ret=-1;
 mktemp (tmpl);
 ret = open (tmpl, O_RDWR | O_BINARY | O_CREAT | O_EXCL | _O_SHORT_LIVED,
-	      _S_IREAD | _S_IWRITE);
+_S_IREAD | _S_IWRITE);
 return ret;
 }
 #define HAVE_MKSTEMP 1
 #endif
 if (nargin == 1 || nargin == 2)
 {
 std::string tmpl8 = args(0).string_value ();
 if (! error_state)
-	{
+{
-	  OCTAVE_LOCAL_BUFFER (char, tmp, tmpl8.size () + 1);
+OCTAVE_LOCAL_BUFFER (char, tmp, tmpl8.size () + 1);
-	  strcpy (tmp, tmpl8.c_str ());
+strcpy (tmp, tmpl8.c_str ());
 #if defined (HAVE_MKSTEMP)
-	  int fd = mkstemp (tmp);
+int fd = mkstemp (tmp);
 #else
-	  int fd = mkstemps (tmp, 0);
+int fd = mkstemps (tmp, 0);
 #endif
-	  if (fd < 0)
+if (fd < 0)
-	    {
+{
-	      using namespace std;
+using namespace std;
-	      retval(2) = ::strerror (errno);
+retval(2) = ::strerror (errno);
-	      retval(0) = fd;
+retval(0) = fd;
-	    }
+}
-	  else
+else
-	    {
+{
-	      const char *fopen_mode = "w+";
+const char *fopen_mode = "w+";
-	      FILE *fid = fdopen (fd, fopen_mode);
+FILE *fid = fdopen (fd, fopen_mode);
-	      if (fid)
+if (fid)
-		{
+{
-		  std::string nm = tmp;
+std::string nm = tmp;
-		  std::ios::openmode md = fopen_mode_to_ios_mode (fopen_mode);
+std::ios::openmode md = fopen_mode_to_ios_mode (fopen_mode);
-		  octave_stream s = octave_stdiostream::create (nm, fid, md);
+octave_stream s = octave_stdiostream::create (nm, fid, md);
-		  if (s)
+if (s)
-		    {
+{
-		      retval(1) = nm;
+retval(1) = nm;
-		      retval(0) = octave_stream_list::insert (s);
+retval(0) = octave_stream_list::insert (s);
-		      if (nargin == 2 && args(1).is_true ())
+if (nargin == 2 && args(1).is_true ())
-			mark_for_deletion (nm);
+mark_for_deletion (nm);
-		    }
+}
-		  else
+else
-		    error ("mkstemp: failed to create octave_stdiostream object");
+error ("mkstemp: failed to create octave_stdiostream object");
-		}
+}
-	      else
+else
-		{
+{
-		  using namespace std;
+using namespace std;
-		  retval(2) = ::strerror (errno);
+retval(2) = ::strerror (errno);
-		  retval(0) = -1;
+retval(0) = -1;
-		}
+}
-	    }
+}
-	}
+}
 else
-	error ("mkstemp: expecting string as first argument");
+error ("mkstemp: expecting string as first argument");
 }
 else
 print_usage ();
 #else
 else
 {
 retval = tmp;
 int mult = ibase;
 while ((x = (x - tmp) / obase))
-	{
+{
-	  tmp = x % obase;
+tmp = x % obase;
-	  if (tmp > ibase - 1)
+if (tmp > ibase - 1)
-	    {
+{
-	      ::error ("umask: invalid digit");
+::error ("umask: invalid digit");
-	      break;
+break;
-	    }
+}
-	  retval += mult * tmp;
+retval += mult * tmp;
-	  mult *= ibase;
+mult *= ibase;
-	}
+}
 }
 return retval;
 }
 if (args.length () == 1)
 {
 int mask = args(0).int_value (true);
 if (! error_state)
-	{
+{
-	  if (mask < 0)
+if (mask < 0)
-	    {
+{
-	      status = -1;
+status = -1;
-	      ::error ("umask: MASK must be a positive integer value");
+::error ("umask: MASK must be a positive integer value");
-	    }
+}
-	  else
+else
-	    {
+{
-	      int oct_mask = convert (mask, 8, 10);
+int oct_mask = convert (mask, 8, 10);
-	      if (! error_state)
+if (! error_state)
-		status = convert (octave_umask (oct_mask), 10, 8);
+status = convert (octave_umask (oct_mask), 10, 8);
-	    }
+}
-	}
+}
 else
-	{
+{
-	  status = -1;
+status = -1;
-	  ::error ("umask: expecting integer argument");
+::error ("umask: expecting integer argument");
-	}
+}
 }
 else
 print_usage ();
 if (status >= 0)
 return const_value ("SEEK_END", args, 1);
 }
 static octave_value
 const_value (const char *, const octave_value_list& args,
-	     const octave_value& val)
+const octave_value& val)
 {
 octave_value retval;
 int nargin = args.length ();

Mercurial > octave-nkf

comparison src/file-io.cc @ 10315:57a59eae83cc