Mercurial > hg > octave-nkf
diff src/file-io.cc @ 2599:9705ea40f0a2
[project @ 1996-12-19 04:49:09 by jwe]
| author | jwe |
|---|---|
| date | Thu, 19 Dec 1996 04:49:28 +0000 |
| parents | d07a5d0b57e2 |
| children | 12bc9d0a50b5 |
line wrap: on
line diff
--- a/src/file-io.cc +++ b/src/file-io.cc @@ -182,11 +182,14 @@ } DEFUN (fgetl, args, , - "STRING = fgetl (FILENUM [, LENGTH])\n\ + "[STRING, LENGTH] = fgetl (FILENUM [, LENGTH])\n\ \n\ read a string from a file") { - octave_value retval = -1.0; + octave_value_list retval; + + retval(1) = 0.0; + retval(0) = -1.0; int nargin = args.length (); @@ -204,7 +207,10 @@ string tmp = os->getl (len_arg, err); if (! err) - retval = tmp; + { + retval(1) = (double) tmp.length (); + retval(0) = tmp; + } } else gripe_invalid_file_id ("fgetl"); @@ -216,11 +222,14 @@ } DEFUN (fgets, args, , - "STRING = fgets (FILENUM [, LENGTH])\n\ + "[STRING, LENGTH] = fgets (FILENUM [, LENGTH])\n\ \n\ read a string from a file") { - octave_value retval = -1.0; + octave_value_list retval; + + retval(1) = 0.0; + retval(0) = -1.0; int nargin = args.length (); @@ -238,7 +247,10 @@ string tmp = os->gets (len_arg, err); if (! err) - retval = tmp; + { + retval(1) = (double) tmp.length (); + retval(0) = tmp; + } } else gripe_invalid_file_id ("fgets"); @@ -338,7 +350,9 @@ If fopen fails, FILENUM is set to -1 and ERRMSG contains a\n\ system-dependent error message") { - octave_value_list retval = -1.0; + octave_value_list retval; + + retval(0) = -1.0; int nargin = args.length ();