octave: src/dirfns.cc comparison

comparison src/dirfns.cc @ 4691:bdc51b369a78

[project @ 2004-01-10 18:16:02 by jwe]

author	jwe
date	Sat, 10 Jan 2004 18:16:03 +0000
parents	93ad80b6eef6
children	1cf16fb3459a

comparison

equal deleted inserted replaced

-:b6dc2aad574a
+:bdc51b369a78
 cleanup_iprocstream (void *p)
 {
 delete static_cast <iprocstream *> (p);
 }
-DEFCMD (ls, args, ,
+DEFCMD (ls, args, nargout,
 "-*- texinfo -*-\n\
 @deffn {Command} ls options\n\
-@deffnx {Command} dir options\n\
 List directory contents.  For example,\n\
 \n\
 @example\n\
 ls -l\n\
 @print{} total 12\n\
 The @code{dir} and @code{ls} commands are implemented by calling your\n\
 system's directory listing command, so the available options may vary\n\
 from system to system.\n\
 @end deffn")
 {
-octave_value_list retval;
+octave_value retval;
 int argc = args.length () + 1;
 string_vector argv = args.make_argv ("ls");
 octave_usleep (100);
 char ch;
+OSSTREAM output_buf;
 for (;;)
 	{
 	  if (cmd->get (ch))
-	    octave_stdout << ch;
+	    {
+	      octave_stdout << ch;
+	      output_buf << ch;
+	    }
 	  else
 	    {
 	      if (! cmd->eof () && errno == EAGAIN)
 		{
 		  cmd->clear ();
 		}
 	      else
 		break;
 	    }
 	}
+output_buf << OSSTREAM_ENDS;
+if (nargout > 0)
+	retval = OSSTREAM_STR (output_buf);
+OSSTREAM_FREEZE (output_buf);
 }
 else
 error ("couldn't start process for ls!");
 unwind_protect::run ();
 return retval;
 }
-DEFALIAS (dir, ls);
 DEFUN (pwd, , nargout,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} pwd ()\n\
 Return the current working directory.\n\
 }
 DEFUN (readdir, args, ,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {[@var{files}, @var{err}, @var{msg}] =} readdir (@var{dir})\n\
-Return names of the files in the directory @var{dir} as an array of\n\
+Return names of the files in the directory @var{dir} as a cell array of\n\
-strings.  If an error occurs, return an empty matrix in @var{files}.\n\
+strings.  If an error occurs, return an empty cell array in @var{files}.\n\
 \n\
 If successful, @var{err} is 0 and @var{msg} is an empty string.\n\
 Otherwise, @var{err} is nonzero and @var{msg} contains a\n\
 system-dependent error message.\n\
 @end deftypefn")
 {
 octave_value_list retval;
 retval(2) = std::string ();
 retval(1) = -1.0;
-retval(0) = Matrix ();
+retval(0) = Cell ();
 if (args.length () == 1)
 {
 std::string dirname = args(0).string_value ();
 	  dir_entry dir (file_ops::tilde_expand (dirname));
 	  if (dir)
 	    {
 	      string_vector dirlist = dir.read ();
-	      retval(0) = dirlist.qsort ();
+	      retval(0) = Cell (dirlist.qsort ());
 	      retval(1) = 0.0;
 	    }
 	  else
 	    {
 	      retval(2) = dir.error ();
 }
 DEFUN (glob, args, ,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} glob (@var{pattern})\n\
-Given an array of strings in @var{pattern}, return the list of file\n\
+Given an array of strings in @var{pattern}, return a cell array of file\n\
-names that match any of them, or an empty string if no patterns match.\n\
+names that match any of them, or an empty cell array if no patterns match.\n\
 Tilde expansion is performed on each of the patterns before looking for\n\
 matching file names.  For example,\n\
 \n\
 @example\n\
 @group\n\
 glob (\"/vm*\")\n\
 @result{} \"/vmlinuz\"\n\
 @end group\n\
 @end example\n\
-\n\
-Note that multiple values are returned in a string matrix with the fill\n\
-character set to ASCII NUL.\n\
 @end deftypefn")
 {
 octave_value retval;
 if (args.length () == 1)
 	gripe_wrong_type_arg ("glob", args(0));
 else
 	{
 	  glob_match pattern (file_ops::tilde_expand (pat));
-	  string_vector list = pattern.glob ();
+	  retval = Cell (pattern.glob ());
-	  if (list.empty ())
-	    retval = "";
-	  else
-	    retval = list;
 	}
 }
 else
 print_usage ("glob");

Mercurial > octave

comparison src/dirfns.cc @ 4691:bdc51b369a78