* Bug 16679 fixed: get_function_path('acosh') yielded an error

[scilab.git] / scilab / modules / functions / macros / get_function_path.sci

diff --git a/scilab/modules/functions/macros/get_function_path.sci b/scilab/modules/functions/macros/get_function_path.sci
index ae01655..7b0ee2a 100644 (file)
--- a/scilab/modules/functions/macros/get_function_path.sci
+++ b/scilab/modules/functions/macros/get_function_path.sci
@@ -3,11 +3,14 @@
 // Copyright (C) DIGITEO - 2009-2010 - Allan CORNET
 // Copyright (C) 2013 - Scilab Enterprises - Adeline CARNIS
 //
-// 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.1-en.txt
+// Copyright (C) 2012 - 2016 - Scilab Enterprises
+//
+// This file is hereby licensed under the terms of the GNU GPL v2.0,
+// pursuant to article 5.3.4 of the CeCILL v.2.1.
+// This file was originally licensed under the terms of the CeCILL v2.1,
+// and continues to be available under such terms.
+// For more information, see the COPYING file which you should have received
+// along with this program.
 
 function path = get_function_path(name)
 
@@ -19,19 +22,19 @@ function path = get_function_path(name)
     end
 
     if type(name) <> 10 then
-        error(999,msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"),"get_function_path",1));
+        error(msprintf(_("%s: Wrong type for input argument #%d: string expected.\n"),"get_function_path",1));
     end
 
     if size(name,"*") <> 1 then
-        error(999,msprintf(_("%s: Wrong size for input argument #%d: A string expected.\n"),"get_function_path",1));
+        error(msprintf(_("%s: Wrong size for input argument #%d: string expected.\n"),"get_function_path",1));
     end
 
     libname = whereis(name);
 
-    if libname <> [] then
+    if libname <> [] & libname <> "script" & type(evstr(name))==13 then
         for i = 1:size(libname,"*")
             [funcnames, pathlib] = libraryinfo(libname(i));
-            path = [path ; pathlib + name + ".sci"];
+            path = [path ; fullfile(pathlib, name + ".sci")];
         end
         path = pathconvert(path,%F);
     end