Mercurial > hg > octave-nkf

comparison src/file-io.cc @ 2873:c3f7ed3874af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-04-23 04:01:02 by jwe]
author jwe
date Wed, 23 Apr 1997 04:01:02 +0000
parents 8b262e771614
children 2e45e7a3d45e
comparison
equal deleted inserted replaced
2872:6285237ed3b9 2873:c3f7ed3874af
525 525
526 int nargin = args.length (); 526 int nargin = args.length ();
527 527
528 if (nargin > 1) 528 if (nargin > 1)
529 { 529 {
530 octave_stream *os = octave_stream_list::lookup (args(0)); 530 octave_stream *os = 0;
531 int fmt_n = 0;
532
533 if (args(0).is_string ())
534 os = octave_stream_list::lookup (1);
535 else
536 {
537 fmt_n = 1;
538 os = octave_stream_list::lookup (args(0));
539 }
531 540
532 if (os) 541 if (os)
533 { 542 {
534 if (args(1).is_string ()) 543 if (args(fmt_n).is_string ())
535 { 544 {
536 string fmt = args(1).string_value (); 545 string fmt = args(fmt_n).string_value ();
537 546
538 octave_value_list tmp_args; 547 octave_value_list tmp_args;
539 548
540 if (nargin > 2) 549 if (nargin > 1 + fmt_n)
541 { 550 {
542 tmp_args.resize (nargin-2, octave_value ()); 551 tmp_args.resize (nargin-fmt_n-1, octave_value ());
543 552
544 for (int i = 2; i < nargin; i++) 553 for (int i = fmt_n + 1; i < nargin; i++)
545 tmp_args(i-2) = args(i); 554 tmp_args(i-fmt_n-1) = args(i);
546 } 555 }
547 556
548 retval = os->printf (fmt, tmp_args); 557 retval = os->printf (fmt, tmp_args);
549 } 558 }
550 else 559 else