bug 4696
Allan CORNET [Thu, 6 Aug 2009 09:29:55 +0000 (11:29 +0200)]
67 files changed:
scilab/CHANGES_5.2.X
scilab/etc/scilab.start
scilab/modules/core/demos/intro/dem01.dem
scilab/modules/core/macros/toolboxes.sci
scilab/modules/differential_equations/demos/n_pendulum/macros.sci
scilab/modules/differential_equations/demos/n_pendulum/n_pendulum.sci
scilab/modules/differential_equations/demos/wheel/show.sci
scilab/modules/dynamic_link/demos/call_c.sce
scilab/modules/dynamic_link/demos/call_fortran.sce
scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/dynamic_link/tests/nonreg_tests/bug_3647.dia.ref
scilab/modules/dynamic_link/tests/nonreg_tests/bug_3647.tst
scilab/modules/dynamic_link/tests/unit_tests/addinter.macosx.dia.ref
scilab/modules/dynamic_link/tests/unit_tests/addinter.tst
scilab/modules/dynamic_link/tests/unit_tests/addinter.unix.dia.ref
scilab/modules/dynamic_link/tests/unit_tests/addinter.win.dia.ref
scilab/modules/dynamic_link/tests/unit_tests/addinter_loop.tst
scilab/modules/dynamic_link/tests/unit_tests/call.dia.ref
scilab/modules/dynamic_link/tests/unit_tests/call.tst
scilab/modules/dynamic_link/tests/unit_tests/links.dia.ref
scilab/modules/dynamic_link/tests/unit_tests/links.tst
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/help/en_US/chdir.xml
scilab/modules/fileio/help/en_US/get_absolute_file_path.xml
scilab/modules/fileio/help/en_US/getrelativefilename.xml
scilab/modules/fileio/help/en_US/pwd.xml
scilab/modules/fileio/help/fr_FR/chdir.xml
scilab/modules/fileio/help/fr_FR/pwd.xml
scilab/modules/fileio/help/pt_BR/chdir.xml
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/macros/getcwd.sci [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_pwd.c [moved from scilab/modules/fileio/sci_gateway/c/sci_getcwd.c with 93% similarity]
scilab/modules/fileio/sci_gateway/fileio_gateway.xml
scilab/modules/fileio/tests/unit_tests/non-iso-filename.dia.ref
scilab/modules/fileio/tests/unit_tests/non-iso-filename.tst
scilab/modules/functions/help/en_US/exec.xml
scilab/modules/functions/help/en_US/getd.xml
scilab/modules/functions/help/fr_FR/exec.xml
scilab/modules/functions/help/fr_FR/getd.xml
scilab/modules/functions/help/pt_BR/exec.xml
scilab/modules/functions/tests/nonreg_tests/bug_1966.dia.ref
scilab/modules/functions/tests/nonreg_tests/bug_1966.tst
scilab/modules/gui/etc/graphics_menubar.xml
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/etc/main_toolbar.xml
scilab/modules/gui/help/en_US/addmenu.xml
scilab/modules/gui/tests/nonreg_tests/bug_3940.tst
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/m2sci/macros/cb_m2sci_gui.sci
scilab/modules/m2sci/macros/m2sci_gui.sci
scilab/modules/matio/tests/unit_tests/savematfile.dia.ref
scilab/modules/matio/tests/unit_tests/savematfile.tst
scilab/modules/optimization/macros/lmitool.sci
scilab/modules/scicos/macros/scicos_auto/scicos.sci
scilab/modules/scicos/macros/scicos_auto/scicos_simulate.sci
scilab/modules/scicos/macros/scicos_scicos/CodeGeneration_.sci
scilab/modules/scicos/macros/scicos_scicos/buildnewblock.sci
scilab/modules/scicos/macros/scicos_scicos/do_SaveAs.sci
scilab/modules/scicos/macros/scicos_scicos/do_browser.sci
scilab/modules/scicos/macros/scicos_scicos/do_load.sci
scilab/modules/scicos/macros/scicos_scicos/do_pal_tree.sci
scilab/modules/scicos/macros/scicos_scicos/do_scsm_tree.sci
scilab/modules/scicos/macros/scicos_scicos/scicos_block_link.sci
scilab/modules/tclsci/macros/tk_getfile.sci

index 3dea2b0..55efcaa 100644 (file)
@@ -65,7 +65,7 @@ Core functions:
      + type
      + typename
      
- - sethomedirectory is obsolete. 
+ - sethomedirectory is obsolete (see home). 
 
 fileio functions:
 =================
@@ -78,7 +78,8 @@ fileio functions:
   
   - pathconvert : If the flagtrail argument is set to FALSE and the trailing separator
                   of the path is removed (if present of course). See Bug 4468.
-
+                  
+  - getcwd is obsolete (see pwd). 
 Dynamic link:
 =============
 
index 27eb6c9..6d29d5d 100644 (file)
@@ -66,7 +66,7 @@ global %modalWarning;
 clear %modalWarning;
 
 // Create some configuration variables ================================
-PWD = getcwd();
+PWD = pwd();
 
 // Define Initial demo tables  ========================================
 // demolist is a two column matrix of strings
@@ -146,7 +146,7 @@ if sciargs()<>"-nouserstartup" then
   clear startup ierr startup_path
 
   // working dir startup (if any)
-  if (SCIHOME <> getcwd()) then
+  if (SCIHOME <> pwd()) then
     if (fileinfo(".scilab") <> []) then
       exec(".scilab",-1);
     else
index 98c3f16..029e29d 100644 (file)
@@ -210,7 +210,7 @@ foo=['void foo(double *a,double *b,double *c)';
 // we use TMPDIR for compilation 
        
 if ~c_link('foo') then
-  path = getcwd(); 
+  path = pwd(); 
   chdir(TMPDIR); 
   mputl(foo,'foo.c');
   ilib_for_link(['foo'],'foo.o',[],"c");
index ed9dfa5..f0c8241 100644 (file)
@@ -22,7 +22,7 @@ function [y]=toolboxes(path,flag,force)
 function y = build(i)
   global %toolboxes
   global %toolboxes_dir
-  y = 'p=getcwd();chdir("""+%toolboxes_dir+%toolboxes(i)+""");exec(""builder.sce"");chdir(p)';
+  y = 'p=pwd();chdir("""+%toolboxes_dir+%toolboxes(i)+""");exec(""builder.sce"");chdir(p)';
 endfunction
 //===========================================================
 function distrib_clean ()
@@ -100,7 +100,7 @@ endfunction
     force = %f 
   end
   
-  cur_wd = getcwd();
+  cur_wd = pwd();
   chdir(path);
   files = listfiles('.');
   contribs = [];
index 4685f7e..c20462c 100644 (file)
@@ -100,7 +100,7 @@ function []=npend_build_and_load()
 // we use TMPDIR
 
   if ~c_link('npend') then
-    cdpath = getcwd(); 
+    cdpath = pwd(); 
     chdir(TMPDIR); 
     fcode=mgetl(SCI+'/modules/others/demos/simulation/npend/Maple/dlslv.f');mputl(fcode,'dlslv.f')
     fcode=mgetl(SCI+'/modules/others/demos/simulation/npend/Maple/ener.f');mputl(fcode,'ener.f')
index 40fb918..bcb9a9c 100644 (file)
@@ -31,7 +31,7 @@ function []=npend_build_and_load()
        
        if ~c_link('npend') then
                path   = SCI+"/modules/differential_equations/demos/n_pendulum/Maple/"
-               cdpath = getcwd();
+               cdpath = pwd();
                chdir(TMPDIR);
                fcode = mgetl(path+'dlslv.f');mputl(fcode,'dlslv.f');
                fcode = mgetl(path+'ener.f');mputl(fcode,'ener.f');
index 755b761..fee8fd2 100644 (file)
@@ -147,7 +147,7 @@ function []=wheel_build_and_load()
        // we use TMPDIR
        
        if ~c_link("wheel") then
-               my_cur_path = getcwd();
+               my_cur_path = pwd();
                chdir(TMPDIR);
                path  = SCI+"/modules/differential_equations/demos/wheel/Maple";
                fcode = mgetl(path+"/dlslv.f");  mputl(fcode,"dlslv.f");
index 8583137..067ddc5 100644 (file)
@@ -23,7 +23,7 @@ if haveacompiler() then
 if ~c_link('foo') then
   cur_ilib_verbose = ilib_verbose();
   ilib_verbose(1);
-  path = getcwd(); 
+  path = pwd(); 
   chdir(TMPDIR); 
   mputl(foo,'foo.c');
   
index 1582d49..9a34c64 100644 (file)
@@ -22,7 +22,7 @@ foof = ['      subroutine foof(a,b,c)';
 // we use TMPDIR for compilation 
        
 if ~c_link('foof') then
-  path = getcwd(); 
+  path = pwd(); 
   chdir(TMPDIR); 
   mputl(foof,'foof.f');
   
index cd7a65a..b8b7dcc 100644 (file)
@@ -31,7 +31,7 @@ function libn = ilib_compile(lib_name,makename,files, ..
     return ;
   end
   
-  oldpath = getcwd();
+  oldpath = pwd();
   files = files(:)';
   
   managed_ext = ['.obj','.o'];
index 25d656a..f90280c 100644 (file)
@@ -19,7 +19,7 @@ foo=['void verylongfunctionnamewithmore24characters(double *a,double *b,double *
 // we use TMPDIR for compilation
        
 if ~c_link('foo') then
-  curPath = getcwd();
+  curPath = pwd();
   chdir(TMPDIR);
   mputl(foo,'foo.c');
   ilib_for_link(['verylongfunctionnamewithmore24characters'],'foo.c',[],"c");
index 2a4ef29..896a52a 100644 (file)
@@ -24,7 +24,7 @@ foo=['void verylongfunctionnamewithmore24characters(double *a,double *b,double *
 // we use TMPDIR for compilation 
        
 if ~c_link('foo') then
-  curPath = getcwd(); 
+  curPath = pwd(); 
   chdir(TMPDIR); 
   mputl(foo,'foo.c');
   
index 3f8c233..67406cc 100644 (file)
@@ -11,7 +11,7 @@
 // test addinter
 //================================================
 if ~c_link('libintertest') then
-  curPath = getcwd();
+  curPath = pwd();
   copyfile(SCI+filesep()+'modules'+filesep()+'dynamic_link'+filesep()+'tests'+filesep()+'unit_tests'+filesep()+'addinter.c', TMPDIR+filesep()+'addinter.c');
   chdir(TMPDIR);
   files=['addinter.o'];
index 97ca950..199d71d 100644 (file)
@@ -13,7 +13,7 @@
 // test addinter
 //================================================
 if ~c_link('libintertest') then
-  curPath = getcwd(); 
+  curPath = pwd(); 
   copyfile(SCI+filesep()+'modules'+filesep()+'dynamic_link'+filesep()+'tests'+filesep()+'unit_tests'+filesep()+'addinter.c', TMPDIR+filesep()+'addinter.c');
   chdir(TMPDIR); 
   files=['addinter.o'];
index 261bd46..a5d4aa1 100644 (file)
@@ -11,7 +11,7 @@
 // test addinter
 //================================================
 if ~c_link('libintertest') then
-  curPath = getcwd();
+  curPath = pwd();
   copyfile(SCI+filesep()+'modules'+filesep()+'dynamic_link'+filesep()+'tests'+filesep()+'unit_tests'+filesep()+'addinter.c', TMPDIR+filesep()+'addinter.c');
   chdir(TMPDIR);
   files=['addinter.o'];
index 895696a..d418e17 100644 (file)
@@ -2,7 +2,7 @@
 // test addinter
 //================================================
 if ~c_link('libintertest') then
-  curPath = getcwd();
+  curPath = pwd();
   copyfile(SCI+filesep()+'modules'+filesep()+'dynamic_link'+filesep()+'tests'+filesep()+'unit_tests'+filesep()+'addinter.c', TMPDIR+filesep()+'addinter.c');
   chdir(TMPDIR);
   files=['addinter.o'];
index 712bc2e..3c8dc62 100644 (file)
@@ -25,7 +25,7 @@ lines(0);
 loop_max = 77; // may be more on linux
 //================================================
 ulink();
-curPath = getcwd();
+curPath = pwd();
 chdir(TMPDIR); 
 //================================================
 // creates C functions
index 1f79b49..702838e 100644 (file)
@@ -15,7 +15,7 @@ foo=['void foo(double *a,double *b,double *c)';
 // we use TMPDIR for compilation
        
 if ~c_link('foo') then
-  curPath = getcwd();
+  curPath = pwd();
   chdir(TMPDIR);
   mputl(foo,'foo.c');
   ilib_for_link(['foo'],'foo.o',[],"c");
index 6e7afd7..3cc4549 100644 (file)
@@ -19,7 +19,7 @@ foo=['void foo(double *a,double *b,double *c)';
 // we use TMPDIR for compilation 
        
 if ~c_link('foo') then
-  curPath = getcwd(); 
+  curPath = pwd(); 
   chdir(TMPDIR); 
   mputl(foo,'foo.c');
   
index 17e8dd0..c910c5e 100644 (file)
@@ -8,7 +8,7 @@
 // <-- ENGLISH IMPOSED -->
 // <-- JVM NOT MANDATORY -->
 ilib_verbose(0);
-curPath = getcwd();
+curPath = pwd();
 pref='ext';
 suf='f';
 routines=[pref(ones(1,12))+string(1:12)+suf(ones(1,12))];
index 980f514..e98116f 100644 (file)
@@ -11,7 +11,7 @@
 
 ilib_verbose(0);
 
-curPath = getcwd(); 
+curPath = pwd(); 
 pref='ext';
 suf='f';
 routines=[pref(ones(1,12))+string(1:12)+suf(ones(1,12))];
index 9bdd7ac..19ae528 100644 (file)
@@ -67,7 +67,7 @@ sci_gateway/c/sci_isdir.c \
 sci_gateway/c/sci_removedir.c \
 sci_gateway/c/sci_createdir.c \
 sci_gateway/c/sci_chdir.c \
-sci_gateway/c/sci_getcwd.c \
+sci_gateway/c/sci_pwd.c \
 sci_gateway/c/sci_mclearerr.c \
 sci_gateway/c/sci_mclose.c \
 sci_gateway/c/sci_merror.c \
index 3842c6d..1b7eaa1 100644 (file)
@@ -137,7 +137,7 @@ am__objects_2 = libscifileio_la-gw_fileio.lo \
        libscifileio_la-sci_fileext.lo libscifileio_la-sci_isdir.lo \
        libscifileio_la-sci_removedir.lo \
        libscifileio_la-sci_createdir.lo libscifileio_la-sci_chdir.lo \
-       libscifileio_la-sci_getcwd.lo libscifileio_la-sci_mclearerr.lo \
+       libscifileio_la-sci_pwd.lo libscifileio_la-sci_mclearerr.lo \
        libscifileio_la-sci_mclose.lo libscifileio_la-sci_merror.lo \
        libscifileio_la-sci_mget.lo libscifileio_la-sci_mgetstr.lo \
        libscifileio_la-sci_moef.lo libscifileio_la-sci_mopen.lo \
@@ -460,7 +460,7 @@ sci_gateway/c/sci_isdir.c \
 sci_gateway/c/sci_removedir.c \
 sci_gateway/c/sci_createdir.c \
 sci_gateway/c/sci_chdir.c \
-sci_gateway/c/sci_getcwd.c \
+sci_gateway/c/sci_pwd.c \
 sci_gateway/c/sci_mclearerr.c \
 sci_gateway/c/sci_mclose.c \
 sci_gateway/c/sci_merror.c \
@@ -735,7 +735,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_fscanfMat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_fullpath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_get_absolute_file_path.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getcwd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_pwd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getdrives.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getlongpathname.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_getrelativefilename.Plo@am__quote@
@@ -1217,12 +1217,12 @@ libscifileio_la-sci_chdir.lo: sci_gateway/c/sci_chdir.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_chdir.lo `test -f 'sci_gateway/c/sci_chdir.c' || echo '$(srcdir)/'`sci_gateway/c/sci_chdir.c
 
-libscifileio_la-sci_getcwd.lo: sci_gateway/c/sci_getcwd.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_getcwd.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_getcwd.Tpo -c -o libscifileio_la-sci_getcwd.lo `test -f 'sci_gateway/c/sci_getcwd.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getcwd.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscifileio_la-sci_getcwd.Tpo $(DEPDIR)/libscifileio_la-sci_getcwd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_getcwd.c' object='libscifileio_la-sci_getcwd.lo' libtool=yes @AMDEPBACKSLASH@
+libscifileio_la-sci_pwd.lo: sci_gateway/c/sci_pwd.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_pwd.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_pwd.Tpo -c -o libscifileio_la-sci_pwd.lo `test -f 'sci_gateway/c/sci_pwd.c' || echo '$(srcdir)/'`sci_gateway/c/sci_pwd.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscifileio_la-sci_pwd.Tpo $(DEPDIR)/libscifileio_la-sci_pwd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_pwd.c' object='libscifileio_la-sci_pwd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_getcwd.lo `test -f 'sci_gateway/c/sci_getcwd.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getcwd.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_pwd.lo `test -f 'sci_gateway/c/sci_pwd.c' || echo '$(srcdir)/'`sci_gateway/c/sci_pwd.c
 
 libscifileio_la-sci_mclearerr.lo: sci_gateway/c/sci_mclearerr.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_mclearerr.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mclearerr.Tpo -c -o libscifileio_la-sci_mclearerr.lo `test -f 'sci_gateway/c/sci_mclearerr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mclearerr.c
index 54a8cd0..1145b3a 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath=".\sci_gateway\c\sci_getcwd.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\sci_gateway\c\sci_getdrives.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\sci_gateway\c\sci_pwd.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\sci_gateway\c\sci_removedir.c"
                                >
                        </File>
index a63ee46..17355e3 100644 (file)
@@ -63,7 +63,7 @@ cd SCI
     <title>See Also</title>
     <simplelist type="inline">
       <member>
-        <link linkend="getcwd">getcwd</link>
+        <link linkend="pwd">pwd</link>
       </member>
     </simplelist>
   </refsection>
index 39e2447..d4f012e 100644 (file)
@@ -99,7 +99,7 @@ mclose(a);
 
       <member><link linkend="getlongpathname">getlongpathname</link></member>
 
-      <member><link linkend="getcwd">getcwd</link></member>
+      <member><link linkend="pwd">pwd</link></member>
     </simplelist>
   </refsection>
 
index 33cbbab..084a632 100644 (file)
@@ -60,12 +60,12 @@ if MSDOS then
        getrelativefilename('C:\program file\scilab-4.0\bin\','C:\program file\scilab-4.0\modules\helptools\help.dtd')
        getrelativefilename(SCI+'\bin',SCI+'\modules\helptools\help.dtd')
        getrelativefilename(WSCI+'\bin',WSCI+'\modules\helptools\help.dtd')
-       getrelativefilename(getcwd(),WSCI+'\bin\Wscilex')
+       getrelativefilename(pwd(),WSCI+'\bin\Wscilex')
 else
        getrelativefilename('/usr/local/scilab-4.0/bin','/usr/local/scilab-4.0/modules/helptools/help.dtd')
        getrelativefilename('/usr/local/scilab-4.0/bin/','/usr/local/scilab-4.0/modules/helptools/help.dtd')
        getrelativefilename(SCI+'/bin',SCI+'/modules/helptools/help.dtd')
-       getrelativefilename(getcwd(),SCI+'/bin/scilex')
+       getrelativefilename(pwd(),SCI+'/bin/scilex')
 end
 
        ]]></programlisting>
@@ -80,7 +80,7 @@ end
         <link linkend="getlongpathname">getlongpathname</link>
       </member>
       <member>
-        <link linkend="getcwd">getcwd</link>
+        <link linkend="pwd">pwd</link>
       </member>
     </simplelist>
   </refsection>
index 8169959..d33c5b9 100644 (file)
@@ -7,20 +7,19 @@
     <refname>pwd</refname>
     <refpurpose> print Scilab current directory</refpurpose>
   </refnamediv>
-  <refnamediv xml:id="getcwd">
-    <refname>getcwd</refname>
+  <refnamediv xml:id="pwd">
+    <refname>pwd</refname>
     <refpurpose> get Scilab current directory</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
     <synopsis>pwd
-x=pwd()
-x=getcwd()</synopsis>
+x=pwd()</synopsis>
   </refsynopsisdiv>
   <refsection>
     <title>Description</title>
     <para><literal>pwd</literal> returns in <literal>ans</literal> the Scilab current directory.
-    <literal>x=pwd()</literal> or <literal>x=getcwd()</literal> returns in <literal>x</literal> the Scilab current
+    <literal>x=pwd()</literal></literal> returns in <literal>x</literal> the Scilab current
     directory.</para>
   </refsection>
   <refsection>
index 546968b..7223200 100644 (file)
@@ -58,9 +58,6 @@ cd path</synopsis>
     <title>Voir Aussi</title>
     <simplelist type="inline">
       <member>
-        <link linkend="getcwd">getcwd</link>
-      </member>
-      <member>
         <link linkend="pwd">pwd</link>
       </member>
     </simplelist>
index e7a45ca..0bf80b1 100644 (file)
@@ -7,20 +7,19 @@
     <refname>pwd</refname>
     <refpurpose> affiche le répertoire courant de Scilab  </refpurpose>
   </refnamediv>
-  <refnamediv xml:id="getcwd">
-    <refname>getcwd</refname>
+  <refnamediv xml:id="pwd">
+    <refname>pwd</refname>
     <refpurpose> renvoie le répertoire courant de Scilab  </refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Séquence d'appel</title>
     <synopsis>pwd
-x=pwd()
-x=getcwd()</synopsis>
+x=pwd()</synopsis>
   </refsynopsisdiv>
   <refsection>
     <title>Description</title>
     <para><literal>pwd</literal> renvoie dans <literal>ans</literal> le répertoire courant de Scilab.
-      <literal>x=pwd()</literal> ou <literal>x=getcwd()</literal> renvoie dans <literal>x</literal> le répertoire courant de Scilab.
+      <literal>x=pwd()</literal> renvoie dans <literal>x</literal> le répertoire courant de Scilab.
     </para>
   </refsection>
   <refsection>
index d9f0458..6fdba94 100644 (file)
@@ -88,7 +88,7 @@ cd SCI
     <title>Ver Também</title>
 
     <simplelist type="inline">
-      <member><link linkend="getcwd">getcwd</link></member>
+      <member><link linkend="pwd">pwd</link></member>
     </simplelist>
   </refsection>
 </refentry>
index b4fc879..9f7d5a2 100644 (file)
@@ -46,7 +46,7 @@ int sci_isdir(char *fname,unsigned long fname_len);
 int sci_createdir(char *fname,unsigned long fname_len);
 int sci_removedir(char *fname,unsigned long fname_len);
 int sci_chdir(char *fname,unsigned long fname_len);
-int sci_getcwd(char *fname,unsigned long fname_len);
+int sci_pwd(char *fname,unsigned long fname_len);
 int sci_fileinfo(char *fname,unsigned long fname_len);
 int sci_newest(char *fname,unsigned long fname_len);
 int sci_getrelativefilename(char *fname, unsigned long l);
diff --git a/scilab/modules/fileio/macros/getcwd.sci b/scilab/modules/fileio/macros/getcwd.sci
new file mode 100644 (file)
index 0000000..7e52b1d
--- /dev/null
@@ -0,0 +1,15 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Allan CORNET
+// 
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at    
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+//------------------------------------------------------------------------------
+function path_getcwd = getcwd()
+  warnobsolete("pwd","5.4");
+  path_getcwd = pwd();
+endfunction
+//------------------------------------------------------------------------------
index 1159bd8..ad5561f 100644 (file)
@@ -49,7 +49,7 @@ static gw_generic_table Tab[FILEIO_TAB_SIZE]={
        {sci_isdir,"isdir"},
        {sci_removedir,"removedir"},
        {sci_createdir,"createdir"},
-       {sci_getcwd,"getcwd"},
+       {sci_pwd,"pwd"},
        {sci_chdir,"chdir"},
        {sci_fileinfo,"fileinfo"},
        {sci_newest,"newest"},
@@ -9,14 +9,14 @@
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-#include "gw_core.h"
+#include "gw_fileio.h"
 #include "stack-c.h"
 #include "scicurdir.h"
 #include "MALLOC.h"
 #include "Scierror.h"
 #include "localization.h"
 /*--------------------------------------------------------------------------*/
-int sci_getcwd(char *fname,unsigned long fname_len)
+int sci_pwd(char *fname,unsigned long fname_len)
 {
        int ierr = 0;
        int lpath = 0;
index f044885..956566f 100644 (file)
@@ -64,7 +64,6 @@
 <PRIMITIVE gatewayId="34" primitiveId="29" primitiveName="removedir"/>
 <PRIMITIVE gatewayId="34" primitiveId="30" primitiveName="createdir"/>
 <PRIMITIVE gatewayId="34" primitiveId="31" primitiveName="pwd" />
-<PRIMITIVE gatewayId="34" primitiveId="31" primitiveName="getcwd" />
 <PRIMITIVE gatewayId="34" primitiveId="32" primitiveName="chdir" />
 <PRIMITIVE gatewayId="34" primitiveId="33" primitiveName="fileinfo" />
 <PRIMITIVE gatewayId="34" primitiveId="34" primitiveName="newest" />
index bbf9263..18e6766 100644 (file)
@@ -27,10 +27,9 @@ olddir=pwd();
     createdir(dirName+'_other');
     if isdir(dirName+'_other') == %f then bugmes();quit;end
     cd(dirName);
-    // 2. Fix bug in  sci_getcwd, for pwd and getcwd
+    // 2. Fix bug in  sci_pwd, for pwd
     // =========================================================================
     if ~(length(pwd()) > 0) then bugmes();quit;end
-    if ~(length(getcwd()) > 0) then bugmes();quit;end
     // 3. test mopen
     // =========================================================================
     fd=mopen(fileName,'w');
@@ -121,10 +120,9 @@ olddir=pwd();
     createdir(dirName+'_other');
     if isdir(dirName+'_other') == %f then bugmes();quit;end
     cd(dirName);
-    // 2. Fix bug in  sci_getcwd, for pwd and getcwd
+    // 2. Fix bug in  sci_pwd, for pwd
     // =========================================================================
     if ~(length(pwd()) > 0) then bugmes();quit;end
-    if ~(length(getcwd()) > 0) then bugmes();quit;end
     // 3. test mopen
     // =========================================================================
     fd=mopen(fileName,'w');
index 33c54fe..c0223cc 100644 (file)
@@ -38,11 +38,10 @@ olddir=pwd();
     cd(dirName);
     
     
-    // 2. Fix bug in  sci_getcwd, for pwd and getcwd
+    // 2. Fix bug in  sci_pwd, for pwd
     // =========================================================================
     
     if ~(length(pwd()) > 0) then pause, end
-    if ~(length(getcwd()) > 0) then pause, end
     
     
     // 3. test mopen
@@ -173,11 +172,10 @@ olddir=pwd();
     cd(dirName);
     
     
-    // 2. Fix bug in  sci_getcwd, for pwd and getcwd
+    // 2. Fix bug in  sci_pwd, for pwd
     // =========================================================================
     
     if ~(length(pwd()) > 0) then pause, end
-    if ~(length(getcwd()) > 0) then pause, end
     
     
     // 3. test mopen
index e7223d2..047bcb4 100644 (file)
@@ -136,7 +136,7 @@ whos -name "a "
         <link linkend="chdir">chdir</link>
       </member>
       <member>
-        <link linkend="getcwd">getcwd</link>
+        <link linkend="pwd">pwd</link>
       </member>
     </simplelist>
   </refsection>
index 07ea286..ebcdc52 100644 (file)
@@ -57,9 +57,6 @@ getd('SCI/modules/cacsd/macros')
         <link linkend="lib">lib</link>
       </member>
       <member>
-        <link linkend="getcwd">getcwd</link>
-      </member>
-      <member>
         <link linkend="pwd">pwd</link>
       </member>
       <member>
index 19e1b96..aeed38e 100644 (file)
@@ -170,7 +170,7 @@ ierr=exec(fun,'errcatch' [,mode])</synopsis>
         <link linkend="chdir">chdir</link>
       </member>
       <member>
-        <link linkend="getcwd">getcwd</link>
+        <link linkend="pwd">pwd</link>
       </member>
     </simplelist>
   </refsection>
index 96e2450..619ea5f 100644 (file)
@@ -56,7 +56,7 @@ getd('SCI/modules/cacsd/macros')
         <link linkend="lib">lib</link>
       </member>
       <member>
-        <link linkend="getcwd">getcwd</link>
+        <link linkend="pwd">pwd</link>
       </member>
       <member>
         <link linkend="pwd">pwd</link>
index c5ef87b..8951f50 100644 (file)
@@ -156,7 +156,7 @@ whos -name "a "
 
       <member><link linkend="chdir">chdir</link></member>
 
-      <member><link linkend="getcwd">getcwd</link></member>
+      <member><link linkend="pwd">pwd</link></member>
     </simplelist>
   </refsection>
 </refentry>
index 7c3140c..7435894 100644 (file)
 //
 //     getd doesn't work
 //
-//-->getd(getcwd())
+//-->getd(pwd())
 // !--error 998
-//Can't go to directory getd(getcwd())
+//Can't go to directory getd(pwd())
 //at line 14 of function cd called by :
-//cd getd(getcwd())
+//cd getd(pwd())
 my_dir          = pathconvert(TMPDIR+"/bug_1966",%F,%F);
 my_file         = pathconvert(my_dir+"/bug_1966_tst.sci",%F,%F);
 my_function_str = ["function c=bug_1966_tst(a,b)"; ..
@@ -27,4 +27,4 @@ mkdir(my_dir);
 mputl(my_function_str,my_file);
 if execstr("getd(my_dir);","errcatch")   <> 0 then bugmes();quit;end
 cd(my_dir);
-if execstr("getd(getcwd());","errcatch") <> 0 then bugmes();quit;end
+if execstr("getd(pwd());","errcatch") <> 0 then bugmes();quit;end
index 4adba55..9219a41 100644 (file)
 //
 //     getd doesn't work
 //
-//-->getd(getcwd())
+//-->getd(pwd())
 // !--error 998
-//Can't go to directory getd(getcwd())
+//Can't go to directory getd(pwd())
 //at line 14 of function cd called by :
-//cd getd(getcwd())
+//cd getd(pwd())
 
 my_dir          = pathconvert(TMPDIR+"/bug_1966",%F,%F);
 my_file         = pathconvert(my_dir+"/bug_1966_tst.sci",%F,%F);
@@ -32,4 +32,4 @@ mputl(my_function_str,my_file);
 
 if execstr("getd(my_dir);","errcatch")   <> 0 then pause,end
 cd(my_dir);
-if execstr("getd(getcwd());","errcatch") <> 0 then pause,end
+if execstr("getd(pwd());","errcatch") <> 0 then pause,end
index 17b092d..3165fcc 100644 (file)
@@ -9,7 +9,7 @@
         <submenu label="&amp;Load...">
             <callback
             instruction='
-              %fileToLoad = uigetfile("*.scg", getcwd(), gettext("Select a file to load"));
+              %fileToLoad = uigetfile("*.scg", pwd(), gettext("Select a file to load"));
               if ~isempty(%fileToLoad) then
                 xload(%fileToLoad,[SCILAB_FIGURE_ID]);
                 disp(msprintf(gettext("Figure loaded.\n")));
@@ -20,7 +20,7 @@
         <submenu label="&amp;Save...">
              <callback
             instruction='
-              %fileToSave = uiputfile("*.scg", getcwd(), gettext("Select a file to write"));
+              %fileToSave = uiputfile("*.scg", pwd(), gettext("Select a file to write"));
               if ~isempty(%fileToSave) then
                 if isempty(fileparts(%fileToSave, "extension")) then
                   %fileToSave = %fileToSave + ".scg";
@@ -38,7 +38,7 @@
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.bmp", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.bmp", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2bmp([SCILAB_FIGURE_ID], %fileToWrite);
                                end
@@ -49,7 +49,7 @@
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.gif", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.gif", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2gif([SCILAB_FIGURE_ID], %fileToWrite);
                                end
@@ -60,7 +60,7 @@
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.jpg", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.jpg", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2jpg([SCILAB_FIGURE_ID], %fileToWrite);
                                end
@@ -71,7 +71,7 @@
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.png", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.png", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2png([SCILAB_FIGURE_ID], %fileToWrite);
                                end
@@ -82,7 +82,7 @@
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.ppm", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.ppm", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2ppm([SCILAB_FIGURE_ID], %fileToWrite);
                                end
@@ -95,7 +95,7 @@
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.emf", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.emf", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2emf([SCILAB_FIGURE_ID], %fileToWrite);
                                end
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.eps", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.eps", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2eps([SCILAB_FIGURE_ID], %fileToWrite);
                                end
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.fig", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.fig", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2fig([SCILAB_FIGURE_ID], %fileToWrite);
                                end
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.pdf", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.pdf", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2pdf([SCILAB_FIGURE_ID], %fileToWrite);
                                end
                                <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.exportCustomFileChooser' type="3"/>
                                <callback
                                instruction='
-                               %fileToWrite = uigetfile("*.svg", getcwd(), gettext("Select a file name"));
+                               %fileToWrite = uigetfile("*.svg", pwd(), gettext("Select a file name"));
                                if ~isempty(%fileToWrite) then
                                        xs2svg([SCILAB_FIGURE_ID], %fileToWrite);
                                end
index e5f7cbc..b317d8f 100644 (file)
@@ -8,7 +8,7 @@
         <submenu label="&amp;Execute...">
             <callback
             instruction='
-              %fileToExec = uigetfile("*.sc*", getcwd(), gettext("Select a file to execute"));
+              %fileToExec = uigetfile("*.sc*", pwd(), gettext("Select a file to execute"));
               if ~isempty(%fileToExec) then
                 exec(%fileToExec);
                 disp(msprintf(gettext("Execution done.\n")));
@@ -20,7 +20,7 @@
         <submenu label="&amp;Open a file...">
             <callback
             instruction='
-              %fileToOpen = uigetfile("*.sc*", getcwd(), gettext("Select a file to open with Scipad"));
+              %fileToOpen = uigetfile("*.sc*", pwd(), gettext("Select a file to open with Scipad"));
               if ~isempty(%fileToOpen) then
                 scipad(%fileToOpen);
               end
@@ -30,7 +30,7 @@
         <submenu label="&amp;Load environment...">
             <callback
             instruction='
-              %fileToLoad = uigetfile("*.sav", getcwd(), gettext("Select a file to load"));
+              %fileToLoad = uigetfile("*.sav", pwd(), gettext("Select a file to load"));
               if ~isempty(%fileToLoad) then
                 load(%fileToLoad);
                 disp(msprintf(gettext("Environment loaded.\n")));
@@ -41,7 +41,7 @@
         <submenu label="&amp;Save environment...">
             <callback
             instruction='
-              %fileToSave = uiputfile("*.sav", getcwd(), gettext("Select a file to write"));
+              %fileToSave = uiputfile("*.sav", pwd(), gettext("Select a file to write"));
               if ~isempty(%fileToSave) then
                 if isempty(fileparts(%fileToSave, "extension")) then
                   %fileToSave = %fileToSave + ".sav";
@@ -56,7 +56,7 @@
         <submenu label="&amp;Change current directory...">
             <callback
             instruction='
-              %newDir = uigetdir(getcwd(), gettext("Select a directory"));
+              %newDir = uigetdir(pwd(), gettext("Select a directory"));
               if ~isempty(%newDir) then
                 cd(%newDir);
               end
@@ -64,7 +64,7 @@
             type="0"/>
         </submenu>
         <submenu label="&amp;Display current directory">
-            <callback instruction='if iswaitingforinput() then printf("\n%s\n\n%s\n",prompt(),getcwd()); else printf("\n\n%s\n\n",getcwd());end' type="0"/>
+            <callback instruction='if iswaitingforinput() then printf("\n%s\n\n%s\n",prompt(),pwd()); else printf("\n\n%s\n\n",pwd());end' type="0"/>
         </submenu>
         <separator/>
         <submenu label="P&amp;age setup...">
index 2307829..b2837ca 100644 (file)
@@ -8,7 +8,7 @@
     <button icon="document-open.png" tooltiptext="Open a file">
         <callback 
         instruction='
-          %fileToOpen = uigetfile("*.sc*", getcwd(), gettext("Select a file to open with Scipad"));
+          %fileToOpen = uigetfile("*.sc*", pwd(), gettext("Select a file to open with Scipad"));
           if ~isempty(%fileToOpen) then 
             scipad(%fileToOpen);
           end
@@ -36,7 +36,7 @@
     <button icon="folder.png" tooltiptext="Change Current Directory">
         <callback 
         instruction='
-          %newDir = uigetdir(getcwd(), gettext("Select a directory"));
+          %newDir = uigetdir(pwd(), gettext("Select a directory"));
           if ~isempty(%newDir) then 
             cd(%newDir);
           end
index d9d46a1..2c5e381 100644 (file)
@@ -153,7 +153,7 @@ code=[ '#include ""machine.h""'
  '    sciprint(""menu %s(%i) in window %i selected\r\n"",name,*entry+1,*win);'
  '}'];
 //creating foo.c file
-dir=getcwd(); chdir(TMPDIR)
+dir=pwd(); chdir(TMPDIR)
 mputl(code,TMPDIR+'/foo.c');
 //reating Makefile
 ilib_for_link('foo','foo.o',[],'c');
index 4b7cf18..36dea3e 100644 (file)
@@ -17,7 +17,7 @@
 // uigetdir returns a invalid value if you do "cancel"
 
 
-%newDir = uigetdir(getcwd(), gettext("Select a directory"))
+%newDir = uigetdir(pwd(), gettext("Select a directory"))
 // click on cancel
 
 if type(%newDir)<> 10 then pause,end
index 06026e9..aa29744 100644 (file)
@@ -512,7 +512,7 @@ function generated_files = xmltoformat(output_format,dirs,titles,directory_langu
                end
                
                // Save the current directory
-               cur_dir = getcwd();
+               cur_dir = pwd();
                
                // Change Scilab current directory so that Java Indexer works
                if ~chdir(buildDoc_dir) then
@@ -615,7 +615,7 @@ function generated_files = xmltoformat(output_format,dirs,titles,directory_langu
                        end
                        
                        // Save the current directory
-                       cur_dir = getcwd();
+                       cur_dir = pwd();
                        
                        // Change Scilab current directory so that Java Indexer works
                        if ~chdir(buildDoc_dir) then
@@ -670,7 +670,7 @@ function generated_files = xmltoformat(output_format,dirs,titles,directory_langu
                for k=1:nb_dir
                        
                        // Save the current directory
-                       cur_dir = getcwd();
+                       cur_dir = pwd();
                        
                        this_tree  = contrib_tree(dirs(k));
                        
index 95367c3..6384df1 100644 (file)
@@ -58,7 +58,7 @@ elseif get(gcbo,"tag")=="dirradio" then
 //
 elseif get(gcbo,"tag")=="dirbtn" then
   
-  directoryname = uigetdir(getcwd(), gettext("Select the directory to convert"));
+  directoryname = uigetdir(pwd(), gettext("Select the directory to convert"));
   set(findobj("tag", "diredit"), "string", directoryname);
   
 //
@@ -66,7 +66,7 @@ elseif get(gcbo,"tag")=="dirbtn" then
 //
 elseif get(gcbo,"tag")=="filebtn" then
   
-  filename = uigetfile("*.m", getcwd(), gettext("Select the file to convert"));
+  filename = uigetfile("*.m", pwd(), gettext("Select the file to convert"));
   set(findobj("tag", "fileedit"), "string", filename);
   
 //
@@ -74,7 +74,7 @@ elseif get(gcbo,"tag")=="filebtn" then
 //
 elseif get(gcbo,"tag")=="outbtn" then
   
-  directoryname = uigetdir(getcwd(), gettext("Select the directory for generated files"));
+  directoryname = uigetdir(pwd(), gettext("Select the directory for generated files"));
   set(findobj("tag", "outedit"), "string", directoryname);
   
 //
index eae8a25..c8ea19e 100644 (file)
@@ -303,7 +303,7 @@ outlabel = uicontrol("parent", m2scifig,...
     "fontsize", 12);
 outedit = uicontrol("parent", m2scifig,...
     "style", "edit",...
-    "string", getcwd(),...
+    "string", pwd(),...
     "units", "pixels",...
     "position",[3*margin+100 optframemaxy+2*margin-1 figw-6*margin-100-btnw widgeth],...
     "fontname", defaultfont,...
@@ -372,7 +372,7 @@ dirlabel = uicontrol("parent", m2scifig,...
     "tag", "dirlabel");
 diredit = uicontrol("parent", m2scifig,...
     "style", "edit",...
-    "string", getcwd(),...
+    "string", pwd(),...
     "position",[3*margin+100 outframemaxy+2*margin-1 figw-6*margin-100-btnw widgeth],...
     "fontname", defaultfont,...
     "fontunits", "points",...
index 0512be0..14740da 100644 (file)
@@ -161,7 +161,7 @@ for varIndex=1:size(varNames,"*")
        (formatIndex==1 & isempty(strindex(varNames(varIndex), "int")) ...
        & isempty(strindex(varNames(varIndex), "NDarray")) & isempty(strindex(varNames(varIndex), "cell")) & isempty(strindex(varNames(varIndex), "struct")) & isempty(strindex(varNames(varIndex), "sparse")))
         // Save data in Matlab format
-        filename = getcwd()+pathconvert("/")+varNames(varIndex)+binFormats(formatIndex)+"-scilab.mat";
+        filename = pwd()+pathconvert("/")+varNames(varIndex)+binFormats(formatIndex)+"-scilab.mat";
        saveCmd = "savematfile "+filename+" "+varNames(varIndex)+" "+binFormats(formatIndex);
         execstr(saveCmd);
        // Read saved file
index 1d98a25..99f187a 100644 (file)
@@ -198,7 +198,7 @@ for varIndex=1:size(varNames,"*")
        & isempty(strindex(varNames(varIndex), "NDarray")) & isempty(strindex(varNames(varIndex), "cell")) & isempty(strindex(varNames(varIndex), "struct")) & isempty(strindex(varNames(varIndex), "sparse")))
 
         // Save data in Matlab format
-        filename = getcwd()+pathconvert("/")+varNames(varIndex)+binFormats(formatIndex)+"-scilab.mat";
+        filename = pwd()+pathconvert("/")+varNames(varIndex)+binFormats(formatIndex)+"-scilab.mat";
        saveCmd = "savematfile "+filename+" "+varNames(varIndex)+" "+binFormats(formatIndex);
         execstr(saveCmd);
        // Read saved file
index 38fba24..b103179 100644 (file)
@@ -80,7 +80,7 @@ messagebox([gettext('Welcome to LMITOOL');'      ';'   ';
     DNAME=stripblanks(DNAME);
 
 
-      pathname=getcwd();
+      pathname=pwd();
 
       fname = pathname+filesep()+PROBNAME+'.sci';
           
index 4dcecf0..75118c3 100644 (file)
@@ -84,7 +84,7 @@ function [scs_m, newparameters, needcompile, edited] = scicos(scs_m, menus)
     end
 
     //**---- prepare from and to workspace stuff
-    curdir = getcwd() ;
+    curdir = pwd() ;
     chdir(TMPDIR)     ;
     mkdir("Workspace");
     chdir("Workspace");
index 03ffac0..0010aef 100644 (file)
@@ -195,7 +195,7 @@ function Info = scicos_simulate(scs_m, Info, %scicos_context, flag, Ignb)
   end
 
   //prepare from and to workspace stuff
-  curdir = getcwd()
+  curdir = pwd()
   chdir(TMPDIR)
   mkdir('Workspace')
   chdir('Workspace')
index b4a1f6d..66e914b 100644 (file)
@@ -1381,9 +1381,9 @@ function  [ok,XX,alreadyran,flgcdgen,szclkINTemp,freof] = do_compile_superblock4
   foo=3;
   okk=%f;
   rdnom='foo';
-  rpat=getcwd();
+  rpat=pwd();
   libs='';
-  label1=[hname;getcwd()+'/'+hname;''];
+  label1=[hname;pwd()+'/'+hname;''];
 
   while %t do
     ok=%t  // to avoid infinite loop
index 09c3a86..5f828d8 100644 (file)
@@ -109,7 +109,7 @@ function [ok] = buildnewblock(blknam, files, filestan, libs, rpat, ldflags, cfla
     end
 
     //** save path in case of error in ilib_compile
-    oldpath=getcwd();
+    oldpath=pwd();
 
     //** compile Makefile
     ierr=execstr('libn=ilib_compile(''lib''+blknam,Makename)','errcatch')
@@ -155,7 +155,7 @@ function [ok] = buildnewblock(blknam, files, filestan, libs, rpat, ldflags, cfla
     //** "cflags"  : C compiler flags
 
     //** save path in case of error
-    oldpath = getcwd(); //** current working path 
+    oldpath = pwd(); //** current working path 
 
     //** For this revision (22/03/2008) Scicos Super Block and Modelica are handled in a slight different 
     //** ways, so the code is splitted in two branches. 
index dbba341..4f8f138 100644 (file)
@@ -22,7 +22,7 @@
 function [scs_m, edited] = do_SaveAs()
 
   msg = ["Use .cos extension for binary and .cosf for ASCII file"];
-  fname = savefile('*.cos*', getcwd(), msg) //** alias of uigetfile
+  fname = savefile('*.cos*', pwd(), msg) //** alias of uigetfile
 
   if fname==emptystr() then
     return ; //** EXIT point 
index 21606f1..79101ca 100644 (file)
@@ -22,7 +22,7 @@
 function do_browser(scs_m)
 
   tt = scs_TreeView(scs_m);
-  cur_wd = getcwd();
+  cur_wd = pwd();
   chdir(TMPDIR);
   mputl(tt,scs_m.props.title(1)+'.tcl');
   chdir(cur_wd)
index 75df646..cc7e9df 100644 (file)
@@ -55,7 +55,7 @@ function [ok, scs_m, %cpr, edited] = do_load(fname,typ)
       //** conventional Open from current working dir  
       if rhs<=0 then
         file_mask = "*.cos*" ;  //** put a filter 
-       path      =  getcwd() ; //** use the current working directory as default 
+       path      =  pwd() ; //** use the current working directory as default 
        fname     = getfile(file_mask, path, title="Open a Scicos diagram") ;
       end
   end 
index 584b871..f9f70b5 100644 (file)
@@ -34,7 +34,7 @@ function scs_m = do_pal_tree(scicos_pal)
 
   tt = pal_TreeView(scs_m); //** local functions: see below in this file
 
-  cur_wd = getcwd();
+  cur_wd = pwd();
   chdir(TMPDIR);
   mputl(tt,scs_m.props.title(1)+'.tcl');
   chdir(cur_wd)
index ff4a739..d5c7220 100644 (file)
@@ -21,7 +21,7 @@
 
 function scs_m = do_scsm_tree(scs_m)
   tt = scs_m_TreeView(scs_m);
-  cur_wd = getcwd();
+  cur_wd = pwd();
   chdir(TMPDIR);
   mputl(tt,scs_m.props.title(1)+'.tcl');
   chdir(cur_wd)
index a51a99c..fa29923 100644 (file)
@@ -39,7 +39,7 @@ function ok = scicos_block_link(funam, txt, flag)
     return; 
   end
 
-  cur_wd = getcwd(); //** get and save current working directory 
+  cur_wd = pwd(); //** get and save current working directory 
 
   chdir(TMPDIR); //** change to TMPDIR 
 
index 76df67f..791c31f 100644 (file)
@@ -19,7 +19,7 @@ else
   filemask = "*";
 end;
 
-initialdir = getcwd();
+initialdir = pwd();
 if exists("path","local")==1 then
   initialdir = pathconvert(path,%f,%t)
   initialdir = strsubst(initialdir,"\","/")