Mercurial > hg > octave-max

comparison src/sysdep.cc @ 11769:20aba78035b3 release-3-0-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Alias setenv to putenv. Allow single arg to putenv
author David Bateman <dbateman@free.fr>
date Mon, 05 May 2008 11:20:53 -0400
parents 2eb392d058bb
children 0ef13e15319b
comparison
equal deleted inserted replaced
11768:9fd25188cfe1 11769:20aba78035b3
621 } 621 }
622 622
623 DEFUN (putenv, args, , 623 DEFUN (putenv, args, ,
624 "-*- texinfo -*-\n\ 624 "-*- texinfo -*-\n\
625 @deftypefn {Built-in Function} {} putenv (@var{var}, @var{value})\n\ 625 @deftypefn {Built-in Function} {} putenv (@var{var}, @var{value})\n\
626 @deftypefnx {Built-in Function} {} setenv (@var{var}, @var{value})\n\
626 Set the value of the environment variable @var{var} to @var{value}.\n\ 627 Set the value of the environment variable @var{var} to @var{value}.\n\
627 @end deftypefn") 628 @end deftypefn")
628 { 629 {
629 octave_value_list retval; 630 octave_value_list retval;
630 631
631 int nargin = args.length (); 632 int nargin = args.length ();
632 633
633 if (nargin == 2) 634 if (nargin == 2 || nargin == 1)
634 { 635 {
635 std::string var = args(0).string_value (); 636 std::string var = args(0).string_value ();
636 637
637 if (! error_state) 638 if (! error_state)
638 { 639 {
639 std::string val = args(1).string_value (); 640 std::string val = (nargin == 2
641 ? args(1).string_value () : std::string ());
640 642
641 if (! error_state) 643 if (! error_state)
642 octave_env::putenv (var, val); 644 octave_env::putenv (var, val);
643 else 645 else
644 error ("putenv: second argument should be a string"); 646 error ("putenv: second argument should be a string");
649 else 651 else
650 print_usage (); 652 print_usage ();
651 653
652 return retval; 654 return retval;
653 } 655 }
656 DEFALIAS (setenv, putenv);
654 657
655 // FIXME -- perhaps kbhit should also be able to print a prompt? 658 // FIXME -- perhaps kbhit should also be able to print a prompt?
656 659
657 DEFUN (kbhit, args, , 660 DEFUN (kbhit, args, ,
658 "-*- texinfo -*-\n\ 661 "-*- texinfo -*-\n\