From: Vincent COUVERT <vincent.couvert@scilab-enterprises.com>
Date: Wed, 27 May 2015 13:27:16 +0000 (+0200)
Subject: * fileinfo can now take a row vector as input.
X-Git-Tag: 6.0.0-alpha-1~239
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=4d360286cb1c1a7de4be3309916917e556be3d0e

* fileinfo can now take a row vector as input.

Change-Id: Ice354cbef05e11f4ddb8bfbc8ad8826f7734dd9c
---

diff --git a/scilab/CHANGES_6.0.X b/scilab/CHANGES_6.0.X
index d49841d..6f65cc1 100644
--- a/scilab/CHANGES_6.0.X
+++ b/scilab/CHANGES_6.0.X
@@ -21,6 +21,8 @@ File input/output
 
 * mclearerr now returns a flag indicating the file identifier validity.
 
+* fileinfo can now take a row vector as input.
+
 
 Removed functions (previously declared as obsolete)
 ====================================================
diff --git a/scilab/modules/fileio/help/en_US/fileinfo.xml b/scilab/modules/fileio/help/en_US/fileinfo.xml
index 8d18b20..f90960b 100644
--- a/scilab/modules/fileio/help/en_US/fileinfo.xml
+++ b/scilab/modules/fileio/help/en_US/fileinfo.xml
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) XXXX-2008 - INRIA
- * 
+ *
  * 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -25,25 +25,22 @@
             <varlistentry>
                 <term>files</term>
                 <listitem>
-                    <para>a character string or a string column vector, file
-                        pathname.
+                    <para>
+                        a character string or a string vector, file pathname.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>x</term>
                 <listitem>
-                    <para>an integer vector of size 13 containing information or an
-                        empty matrix if file does not exist.
+                    <para>
+                        an integer vector of size 13 containing information or an empty matrix if file does not exist.
                     </para>
                     <para>
-                        If <varname>files</varname> is a string column vector, <varname>x</varname> will be a matrix of
-                        size <literal>m x 13</literal>.
+                        If <varname>files</varname> is a string 1 x m or m x 1 vector, <varname>x</varname> will be a matrix of size <literal>m x 13</literal>.
                     </para>
                     <para>
-                        If a filename does not exist, it will return as output
-                        information a line of size 13 with <constant>Nan</constant>
-                        in each element of this line.
+                        If a filename does not exist, it will return as output information a line of size 13 with <constant>Nan</constant> in each element of this line.
                     </para>
                 </listitem>
             </varlistentry>
@@ -222,4 +219,15 @@ FILES = [SCI;SCIHOME;'not_exist_file';TMPDIR]
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.0</revnumber>
+                <revremark>
+                    <literal>files</literal> can now be a row vector.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
diff --git a/scilab/modules/fileio/tests/unit_tests/fileinfo.dia.ref b/scilab/modules/fileio/tests/unit_tests/fileinfo.dia.ref
index eecebc7..cb8c945 100644
--- a/scilab/modules/fileio/tests/unit_tests/fileinfo.dia.ref
+++ b/scilab/modules/fileio/tests/unit_tests/fileinfo.dia.ref
@@ -12,7 +12,7 @@ if size(x,"*") <> 13 then bugmes();quit;end
 if err == 0 then bugmes();quit;end
 if x <> [] then bugmes();quit;end
 ierr = execstr("fileinfo([SCI,SCIHOME])","errcatch");
-if ierr <> 999 then bugmes();quit;end
+if ierr <> 0 then bugmes();quit;end
 FILES = [SCI;"My_file_not_exist";SCIHOME;TMPDIR];
 [X,ERRS] = fileinfo(FILES);
 if    or(isnan(X(1,:))) then bugmes();quit;end
diff --git a/scilab/modules/fileio/tests/unit_tests/fileinfo.tst b/scilab/modules/fileio/tests/unit_tests/fileinfo.tst
index df4908d0..9cfdc39 100644
--- a/scilab/modules/fileio/tests/unit_tests/fileinfo.tst
+++ b/scilab/modules/fileio/tests/unit_tests/fileinfo.tst
@@ -16,7 +16,7 @@ if err == 0 then pause,end
 if x <> [] then pause,end
 
 ierr = execstr("fileinfo([SCI,SCIHOME])","errcatch");
-if ierr <> 999 then pause,end
+if ierr <> 0 then pause,end
 
 FILES = [SCI;"My_file_not_exist";SCIHOME;TMPDIR];
 [X,ERRS] = fileinfo(FILES);