fix Windows warning about string functions and merge os_xxxx.h in one file 01/15801/5
Antoine ELIAS [Tue, 13 Jan 2015 09:32:52 +0000 (10:32 +0100)]
Change-Id: I828fd64bbbe04030faa7a70a6b0259f573d0dcd7

301 files changed:
scilab/modules/api_scilab/src/cpp/api_error.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/ast/includes/ast/runvisitor.hxx
scilab/modules/ast/includes/operations/types_addition.hxx
scilab/modules/ast/includes/operations/types_transposition.hxx
scilab/modules/ast/includes/types/arrayof.hxx
scilab/modules/ast/includes/types/tostring_common.hxx
scilab/modules/ast/src/cpp/ast/runvisitor.cpp
scilab/modules/ast/src/cpp/operations/types_addition.cpp
scilab/modules/ast/src/cpp/operations/types_and.cpp
scilab/modules/ast/src/cpp/operations/types_or.cpp
scilab/modules/ast/src/cpp/parse/parser.cpp
scilab/modules/ast/src/cpp/symbol/context.cpp
scilab/modules/ast/src/cpp/system_env/configvariable.cpp
scilab/modules/ast/src/cpp/system_env/home.cpp
scilab/modules/ast/src/cpp/system_env/sci_home.cpp
scilab/modules/ast/src/cpp/system_env/sci_path.cpp
scilab/modules/ast/src/cpp/system_env/sci_tmpdir.cpp
scilab/modules/ast/src/cpp/system_env/setenvvar.cpp
scilab/modules/ast/src/cpp/types/double.cpp
scilab/modules/ast/src/cpp/types/function.cpp
scilab/modules/ast/src/cpp/types/graphichandle.cpp
scilab/modules/ast/src/cpp/types/library.cpp
scilab/modules/ast/src/cpp/types/list.cpp
scilab/modules/ast/src/cpp/types/macro.cpp
scilab/modules/ast/src/cpp/types/overload.cpp
scilab/modules/ast/src/cpp/types/singlepoly.cpp
scilab/modules/ast/src/cpp/types/string.cpp
scilab/modules/ast/src/cpp/types/threadId.cpp
scilab/modules/ast/src/cpp/types/tlist.cpp
scilab/modules/ast/src/cpp/types/tostring_common.cpp
scilab/modules/ast/src/cpp/types/types.cpp
scilab/modules/ast/src/cpp/types/types_tools.cpp
scilab/modules/boolean/sci_gateway/cpp/sci_and.cpp
scilab/modules/boolean/sci_gateway/cpp/sci_or.cpp
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/call_scilab/src/c/SendScilabJobs.c
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/c/fileutils.c
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/src/c/completion.c
scilab/modules/completion/src/c/completion_generic.c
scilab/modules/completion/src/c/getCommonPart.c
scilab/modules/completion/src/c/getPartLine.c
scilab/modules/completion/src/cpp/EOFieldsGetter.hxx
scilab/modules/completion/src/cpp/HandleFieldsGetter.hxx
scilab/modules/completion/src/cpp/StructFieldsGetter.hxx
scilab/modules/completion/src/cpp/UnknownMlistFieldsGetter.hxx
scilab/modules/completion/src/cpp/XMLAttrFieldsGetter.hxx
scilab/modules/completion/src/cpp/XMLDocFieldsGetter.hxx
scilab/modules/completion/src/cpp/XMLElemFieldsGetter.hxx
scilab/modules/completion/src/cpp/XMLFieldsGetter.hxx
scilab/modules/completion/src/cpp/XMLListFieldsGetter.hxx
scilab/modules/completion/src/cpp/XMLNsFieldsGetter.hxx
scilab/modules/completion/src/cpp/XMLSetFieldsGetter.hxx
scilab/modules/console/src/c/GetCommandLine.c
scilab/modules/console/src/c/dropFiles.c
scilab/modules/console/src/c/prompt.c
scilab/modules/console/src/c/promptecho.c
scilab/modules/console/src/c/windows/TermCompletion.c
scilab/modules/console/src/c/windows/TermConsole.c
scilab/modules/console/src/c/windows/TermLine.c
scilab/modules/console/src/cpp/ConsoleRead.cpp
scilab/modules/console/src/cpp/scilabRead.cpp
scilab/modules/core/sci_gateway/cpp/sci_getscilabmode.cpp
scilab/modules/core/sci_gateway/cpp/sci_intppty.cpp
scilab/modules/core/sci_gateway/cpp/sci_warning.cpp
scilab/modules/core/src/c/GetXmlFileEncoding.c
scilab/modules/core/src/c/InitializePreferences.c
scilab/modules/core/src/c/commandwords.c
scilab/modules/core/src/c/getcommandlineargs.c
scilab/modules/core/src/c/getdynamicDebugInfo_Windows.c
scilab/modules/core/src/c/getmodules.c
scilab/modules/core/src/c/getos.c
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/loadversion.c
scilab/modules/core/src/c/readGateway.c
scilab/modules/core/src/c/saveCWDInPreferences.c
scilab/modules/core/src/c/transposeMatrix.c
scilab/modules/core/src/cpp/backtrace_print.cpp
scilab/modules/dynamic_link/src/c/dynamiclibrary_others.c
scilab/modules/dynamic_link/src/c/dynamiclibrary_windows.c
scilab/modules/elementary_functions/sci_gateway/cpp/sci_size.cpp
scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironment.hxx
scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c
scilab/modules/fftw/src/c/fftwlibname.c
scilab/modules/fileio/sci_gateway/c/sci_fprintfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/sci_gateway/cpp/sci_filesep.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_findfiles.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_mclose.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_mget.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_mput.cpp
scilab/modules/fileio/src/c/FindFileExtension.c
scilab/modules/fileio/src/c/URIFileToFilename.c
scilab/modules/fileio/src/c/copyfile_others.c
scilab/modules/fileio/src/c/copyfile_windows.c
scilab/modules/fileio/src/c/createtempfilename.c
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/fileio/src/c/do_xxscanf.c
scilab/modules/fileio/src/c/fileinfo.c
scilab/modules/fileio/src/c/filesmanagement.c
scilab/modules/fileio/src/c/findfiles.c
scilab/modules/fileio/src/c/fprintfMat.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/fileio/src/c/getlongpathname.c
scilab/modules/fileio/src/c/getshortpathname.c
scilab/modules/fileio/src/c/isdir.c
scilab/modules/fileio/src/c/removedir.c
scilab/modules/fileio/src/cpp/expandPathVariable.cpp
scilab/modules/fileio/src/cpp/filemanager.cpp
scilab/modules/fileio/src/cpp/mgetl.cpp
scilab/modules/fileio/src/cpp/newest.cpp
scilab/modules/functions/sci_gateway/cpp/sci_exec.cpp
scilab/modules/functions/sci_gateway/cpp/sci_execstr.cpp
scilab/modules/functions_manager/src/cpp/funcmanager.cpp
scilab/modules/graphic_export/sci_gateway/cpp/sci_xend.cpp
scilab/modules/graphic_objects/src/cpp/FigureList.cpp
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/c/sci_light.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/src/c/InitObjects.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/StringMatrix.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getPropertyAssignedValue.c
scilab/modules/graphics/src/c/getHandleProperty/get_auto_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_axes_reverse_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_axes_visible_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_tight_limits_property.c
scilab/modules/graphics/src/c/getHandleProperty/setGetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/set_alignment_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_anti_aliasing_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_arc_drawing_method_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_border_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_cdata_mapping_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_clip_state_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_constraints_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_mapping_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_figure_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_grid_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_image_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_layout_options_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_layout_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_light_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_size_unit_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_menubar_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_rotation_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_scrollable_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tabtitle_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_text_box_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tics_direction_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tics_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_toolbar_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_view_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_x_location_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_y_location_property.c
scilab/modules/graphics/src/c/name2rgb.c
scilab/modules/gui/includes/SetUicontrol.h
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/sci_gateway/c/sci_figure.c
scilab/modules/gui/sci_gateway/c/sci_messagebox.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.c
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/sci_gateway/c/sci_uimenu.c
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_orient.cpp
scilab/modules/gui/sci_gateway/cpp/sci_displaytree.cpp
scilab/modules/gui/sci_gateway/cpp/sci_uigetfile.cpp
scilab/modules/gui/sci_gateway/cpp/sci_uiputfile.cpp
scilab/modules/gui/src/c/buildMainWindowTitle.c
scilab/modules/gui/src/c/getMainWindowTitle.c
scilab/modules/gui/src/c/messageboxoptions.c
scilab/modules/gui/src/cpp/GetScreenProperty.hxx
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/src/c/h5_fileManagement.c
scilab/modules/hdf5/src/cpp/H5NamedObjectsList.hxx
scilab/modules/history_manager/src/c/getCommentDateSession.c
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/history_manager/src/cpp/HistorySearch.cpp
scilab/modules/io/sci_gateway/cpp/sci_file.cpp
scilab/modules/io/sci_gateway/cpp/sci_genlib.cpp
scilab/modules/io/src/c/getenvc.c
scilab/modules/io/src/c/setenvc.c
scilab/modules/io/src/cpp/loadlib.cpp
scilab/modules/jvm/src/c/InitializeJVM.c
scilab/modules/jvm/src/c/getJvmOptions.c
scilab/modules/jvm/src/c/loadClasspath.c
scilab/modules/jvm/src/c/loadLibrarypath.c
scilab/modules/jvm/src/c/loadOnUseClassPath.c
scilab/modules/jvm/src/c/system_getproperty.c
scilab/modules/jvm/src/c/system_setproperty.c
scilab/modules/localization/sci_gateway/c/sci_gettext.c
scilab/modules/localization/sci_gateway/cpp/sci_setdefaultlanguage.cpp
scilab/modules/localization/src/c/InitializeLocalization.c
scilab/modules/localization/src/c/LanguagePreferences_Windows.c
scilab/modules/localization/src/c/getLcidString.c
scilab/modules/localization/src/c/getLocaleInfo_Windows.c
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/matio/src/c/CreateCharVariable.c
scilab/modules/matio/src/c/CreateStructVariable.c
scilab/modules/mexlib/src/cpp/mexlib.cpp
scilab/modules/output_stream/src/cpp/scilab_sprintf.cpp
scilab/modules/parameters/src/c/parameters.c
scilab/modules/preferences/src/c/getScilabPreference.c
scilab/modules/renderer/src/cpp/RendererFontManager.cpp
scilab/modules/scicos/src/c/ezxml.c
scilab/modules/scicos/src/c/ezxml.h
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cevscpe.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmat3d.c
scilab/modules/scicos_blocks/src/c/cmatview.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scicos_blocks/src/cpp/affich2.cpp
scilab/modules/scinotes/src/c/ScilabKeywords.c
scilab/modules/sound/sci_gateway/c/sci_beep.c
scilab/modules/spreadsheet/sci_gateway/c/gw_csv_helpers.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvDefault.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvRead.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvTextScan.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvWrite.c
scilab/modules/spreadsheet/src/c/checkCsvWriteFormat.c
scilab/modules/spreadsheet/src/c/csvDefault.c
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/spreadsheet/src/c/getRange.c
scilab/modules/spreadsheet/src/c/ripole/olestream-unwrap.c
scilab/modules/spreadsheet/src/c/ripole/pldstr.c
scilab/modules/spreadsheet/src/c/utftolatin.c
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/includes/os_strdup.h [deleted file]
scilab/modules/string/includes/os_stricmp.h [deleted file]
scilab/modules/string/includes/os_string.h [new file with mode: 0644]
scilab/modules/string/includes/os_swprintf.h [deleted file]
scilab/modules/string/includes/os_wcsdup.h [deleted file]
scilab/modules/string/includes/os_wcsicmp.h [deleted file]
scilab/modules/string/includes/stricmp.h [deleted file]
scilab/modules/string/sci_gateway/cpp/sci_grep.cpp
scilab/modules/string/sci_gateway/cpp/sci_regexp.cpp
scilab/modules/string/sci_gateway/cpp/sci_strchr.cpp
scilab/modules/string/sci_gateway/cpp/sci_string.cpp
scilab/modules/string/sci_gateway/cpp/sci_strrchr.cpp
scilab/modules/string/sci_gateway/cpp/sci_strstr.cpp
scilab/modules/string/sci_gateway/cpp/sci_strtod.cpp
scilab/modules/string/sci_gateway/cpp/sci_strtok.cpp
scilab/modules/string/sci_gateway/cpp/sci_tokens.cpp
scilab/modules/string/src/c/os_wcsdup.c
scilab/modules/string/src/c/pcre_private.c
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/string/src/c/stringToComplex.c
scilab/modules/string/src/c/stringToDouble.c
scilab/modules/string/src/c/stringsCompare.c
scilab/modules/string/src/c/stringsstrrev.c
scilab/modules/string/src/c/stristr.c
scilab/modules/string/src/c/strsubst.c
scilab/modules/string/src/c/tokens.c
scilab/modules/string/src/cpp/stripblanks.cpp
scilab/modules/tclsci/sci_gateway/c/sci_TCL_EvalStr.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVar.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVersion.c
scilab/modules/tclsci/src/c/InitTclTk.c
scilab/modules/tclsci/src/c/ScilabEval.c
scilab/modules/tclsci/src/c/TCL_ArrayDim.c
scilab/modules/tclsci/src/c/TCL_ArrayGetVar.c
scilab/modules/tclsci/src/c/TCL_Command.c
scilab/modules/types/sci_gateway/cpp/sci_inspectorShowItem.cpp
scilab/modules/types/sci_gateway/cpp/sci_inspectorShowUnreferencedItem.cpp
scilab/modules/ui_data/src/c/PutScilabVariable.c
scilab/modules/ui_data/src/cpp/BrowseVarManager.cpp
scilab/modules/windows_tools/sci_gateway/c/sci_mcisendstring.c
scilab/modules/windows_tools/src/c/FindFileAssociation.c
scilab/modules/windows_tools/src/c/createGUID.c
scilab/modules/windows_tools/src/c/registry.c
scilab/modules/windows_tools/src/c/scilab_windows/FilesAssociations.c
scilab/modules/windows_tools/src/c/scilab_windows/FindScilab.c
scilab/modules/windows_tools/src/c/scilab_windows/TextToPrint.c
scilab/modules/windows_tools/src/c/scilab_windows/WndThread.c
scilab/modules/windows_tools/src/c/scilab_windows/console.c
scilab/modules/windows_tools/src/c/scilab_windows/getVideoAdapters.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj.filters
scilab/modules/windows_tools/src/c/scilab_windows/spawncommand.c
scilab/modules/windows_tools/src/cpp/scilab_windows/SetScilabEnvironmentVariables.cpp [moved from scilab/modules/windows_tools/src/c/scilab_windows/SetScilabEnvironmentVariables.c with 98% similarity]
scilab/modules/windows_tools/src/cpp/scilab_windows/SetScilabEnvironmentVariables.h [moved from scilab/modules/windows_tools/src/c/scilab_windows/SetScilabEnvironmentVariables.h with 100% similarity]
scilab/modules/windows_tools/src/cpp/scilab_windows/getScilabDirectory.cpp [moved from scilab/modules/windows_tools/src/c/scilab_windows/getScilabDirectory.c with 95% similarity]
scilab/modules/windows_tools/src/cpp/scilab_windows/getScilabDirectory.h [moved from scilab/modules/windows_tools/src/c/scilab_windows/getScilabDirectory.h with 100% similarity]
scilab/modules/xml/sci_gateway/cpp/sci_htmlWrite.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_foo_i_XMLList.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlWrite.cpp
scilab/modules/xml/src/cpp/extraction.hxx

index 0031f18..3f5fc40 100644 (file)
@@ -20,7 +20,7 @@ extern "C"
 #include "api_scilab.h"
 #include "sciprint.h"
 #include "Scierror.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "localization.h"
 #include "stackinfo.h"
 #include "mode_exec.h"
index 94d217e..de83f91 100644 (file)
@@ -33,7 +33,7 @@ extern "C"
 #include "localization.h"
 #include "sci_malloc.h"
 #include "freeArrayOfString.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 }
 
 using namespace types;
index ef61de3..36193bc 100644 (file)
@@ -417,7 +417,7 @@ public :
 
             char* strErr =  wide_string_to_UTF8(e.getSymbol().getName().c_str());
 
-            sprintf(pstError, _("Undefined variable: %s\n"), strErr);
+            os_sprintf(pstError, _("Undefined variable: %s\n"), strErr);
             pwstError = to_wide_string(pstError);
             FREE(strErr);
             std::wstring wstError(pwstError);
index fccf29b..93fbd11 100644 (file)
@@ -22,7 +22,7 @@
 #include "string.hxx"
 extern "C"
 {
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 void fillAddFunction();
index 2077a4d..8b9cad5 100644 (file)
@@ -123,7 +123,7 @@ protected :
                 if (m_iSize != 0 && iTmpSize / m_iSize != m_piDims[i])
                 {
                     char message[bsiz];
-                    sprintf(message, _("Can not allocate %.2f MB memory.\n"),  (double) ((double) m_iSize * (double) m_piDims[i] * sizeof(T)) / 1.e6);
+                    os_sprintf(message, _("Can not allocate %.2f MB memory.\n"),  (double) ((double) m_iSize * (double) m_piDims[i] * sizeof(T)) / 1.e6);
                     throw (ast::ScilabError(message));
                 }
 
index 20e5897..afb63c3 100644 (file)
@@ -14,7 +14,7 @@
 #define __TOSTRING_COMMON_HXX__
 
 #include <sstream>
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "dynlib_ast.h"
 
 #define SIZE_BETWEEN_TWO_VALUES         1
index 604ac26..7123a61 100644 (file)
@@ -34,7 +34,7 @@
 extern "C"
 {
 #include "sciprint.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "elem_common.h"
 }
 
@@ -1062,7 +1062,7 @@ void RunVisitorT<T>::visitprivate(const FunctionDec & e)
     {
         char pstError[1024];
         char* pstFuncName = wide_string_to_UTF8(e.getSymbol().getName().c_str());
-        sprintf(pstError, _("It is not possible to redefine the %s primitive this way (see clearfun).\n"), pstFuncName);
+        os_sprintf(pstError, _("It is not possible to redefine the %s primitive this way (see clearfun).\n"), pstFuncName);
         wchar_t* pwstError = to_wide_string(pstError);
         std::wstring wstError(pwstError);
         FREE(pstFuncName);
index f80da90..6456fb1 100644 (file)
@@ -25,7 +25,7 @@ extern "C"
 #include "matrix_addition.h"
 #include "localization.h"
 #include "charEncoding.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "elem_common.h" //dset
 }
 
index 6038f29..45530d1 100644 (file)
@@ -11,7 +11,7 @@
  */
 extern "C"
 {
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 #include "types_and.hxx"
index 65ca8e7..3dda265 100644 (file)
@@ -13,7 +13,7 @@
 
 extern "C"
 {
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 #include "types_or.hxx"
index 13ee3cb..1ace2e3 100644 (file)
@@ -29,7 +29,7 @@ extern "C"
 #include "sci_tmpdir.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #ifdef __APPLE__
 #include "PATH_MAX.h"
 #endif
@@ -153,7 +153,7 @@ void ParserSingleInstance::parse(char *command)
 #ifdef _MSC_VER
     char szFile[MAX_PATH];
     char* pstTmpDIr = getTMPDIR();
-    sprintf(szFile, "%s\\%s", pstTmpDIr, "command.temp");
+    os_sprintf(szFile, "%s\\%s", pstTmpDIr, "command.temp");
     FREE(pstTmpDIr);
     if (fileLocker)
     {
index e8dbf4c..95ce49d 100644 (file)
@@ -23,7 +23,7 @@
 extern "C"
 {
 #include "getmemory.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 namespace symbol
index b1b1872..a682bc7 100644 (file)
@@ -16,7 +16,7 @@
 extern "C"
 {
 #include "strsubst.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 #include "elem_common.h"
 }
index d4af0d6..ad3cff6 100644 (file)
@@ -19,8 +19,7 @@ extern "C"
 {
 #include "home.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "charEncoding.h"
 #include "PATH_MAX.h"
 #include "machine.h"
index f614fda..59ab675 100644 (file)
@@ -20,8 +20,7 @@ extern "C"
 {
 #include "sci_malloc.h"
 #include "sci_home.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "charEncoding.h"
 #include "PATH_MAX.h"
 #include "machine.h"
@@ -136,15 +135,15 @@ char* computeSCIHOME(void)
     }
 
     /* checks that directory exists */
-    strcpy(USERHOMESYSTEM, SHORTUSERHOMESYSTEM);
+    os_strcpy(USERHOMESYSTEM, SHORTUSERHOMESYSTEM);
     if (SHORTUSERHOMESYSTEM)
     {
         delete []SHORTUSERHOMESYSTEM;
     }
 
     /* Set SCIHOME environment variable */
-    sprintf(USERPATHSCILAB, "%s%s%s", USERHOMESYSTEM, DIR_SEPARATOR, BASEDIR);
-    sprintf(SCIHOMEPATH, "%s%s%s", USERPATHSCILAB, DIR_SEPARATOR, SCI_VERSION_STRING);
+    os_sprintf(USERPATHSCILAB, "%s%s%s", USERHOMESYSTEM, DIR_SEPARATOR, BASEDIR);
+    os_sprintf(SCIHOMEPATH, "%s%s%s", USERPATHSCILAB, DIR_SEPARATOR, SCI_VERSION_STRING);
 
     /* creates directory if it does not exists */
     if (!isdir(SCIHOMEPATH))
index a776b5f..c033134 100644 (file)
@@ -21,7 +21,7 @@ extern "C"
 {
 #include "sci_malloc.h"
 #include "sci_path.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "charEncoding.h"
 #include "PATH_MAX.h"
 #include "setenvc.h"
@@ -167,8 +167,8 @@ char* computeSCI()
     char dir[_MAX_DIR];
     char fname[_MAX_FNAME];
     char ext[_MAX_EXT];
+    char SciPathName[_MAX_DRIVE + _MAX_DIR + 5];
 
-    char *SciPathName = NULL;
     char *DirTmp = NULL;
 
     if (!GetModuleFileNameA((HINSTANCE)GetModuleHandleA("libScilab"), ScilabModuleName, MAX_PATH))
@@ -176,7 +176,7 @@ char* computeSCI()
         return NULL;
     }
 
-    _splitpath(ScilabModuleName, drive, dir, fname, ext);
+    os_splitpath(ScilabModuleName, drive, dir, fname, ext);
 
     if (dir[strlen(dir) - 1] == '\\')
     {
@@ -193,21 +193,17 @@ char* computeSCI()
         return NULL;
     }
 
-    SciPathName = new char[strlen(drive) + strlen(dir) + 5];
-    if (SciPathName)
-    {
-        _makepath(SciPathName, drive, dir, NULL, NULL);
+    os_makepath(SciPathName, drive, dir, NULL, NULL);
 
-        for (int i = 0 ; i < static_cast<int>(strlen(SciPathName)) ; i++)
+    for (int i = 0 ; i < static_cast<int>(strlen(SciPathName)) ; i++)
+    {
+        if (SciPathName[i] == '\\')
         {
-            if (SciPathName[i] == '\\')
-            {
-                SciPathName[i] = '/';
-            }
+            SciPathName[i] = '/';
         }
-        SciPathName[strlen(SciPathName) - 1] = '\0';
     }
-    return SciPathName;
+    SciPathName[strlen(SciPathName) - 1] = '\0';
+    return os_strdup(SciPathName);
 }
 #else
 char* computeSCI()
index e2e8910..ae7e583 100644 (file)
@@ -26,7 +26,7 @@ extern "C"
 #include <unistd.h> /* getpid */
 #endif
 #include "sci_tmpdir.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "charEncoding.h"
 #include "PATH_MAX.h"
 #include "setenvc.h"
@@ -34,8 +34,6 @@ extern "C"
 #include "localization.h"
 #include <errno.h>
 #include "removedir.h"
-#include "os_swprintf.h"
-#include "os_strdup.h"
 #include "setenvvar.h"
 #include "getshortpathname.h"
 }
index 82ed9be..9b7b541 100644 (file)
@@ -115,7 +115,7 @@ bool IsTheGoodShell(void)
     strcpy(shellCmd, "");
     strcpy(fname, "");
     GetEnvironmentVariableA("ComSpec", shellCmd, PATH_MAX);
-    _splitpath(shellCmd, drive, dir, fname, ext);
+    os_splitpath(shellCmd, drive, dir, fname, ext);
 
     if (_stricmp(fname, "cmd") == 0)
     {
index cb97e41..0e8ce21 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
 #include "elem_common.h"
 #include "localization.h"
 #include "charEncoding.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 using namespace std;
@@ -921,7 +921,7 @@ double* Double::allocData(int _iSize)
             m_pRealData = NULL;
             m_pImgData = NULL;
             char message[bsiz];
-            sprintf(message, _("Can not allocate negative size (%d).\n"),  _iSize);
+            os_sprintf(message, _("Can not allocate negative size (%d).\n"), _iSize);
             ast::ScilabError se(message);
             se.SetErrorNumber(999);
             throw (se);
@@ -941,7 +941,7 @@ double* Double::allocData(int _iSize)
     catch (std::bad_alloc & /*e*/)
     {
         char message[bsiz];
-        sprintf(message, _("Can not allocate %.2f MB memory.\n"),  (double) (_iSize * sizeof(double)) / 1.e6);
+        os_sprintf(message, _("Can not allocate %.2f MB memory.\n"), (double)(_iSize * sizeof(double)) / 1.e6);
         ast::ScilabError se(message);
         se.SetErrorNumber(999);
         throw (se);
index ec781a0..df48d36 100644 (file)
@@ -28,7 +28,7 @@ extern "C"
 #include "localization.h"
 #include "sci_path.h"
 #include "sci_malloc.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "lasterror.h"
 #include "configvariable_interface.h"
 #include "dynamic_module.h"
index a2aa841..b0c91fc 100644 (file)
@@ -20,7 +20,7 @@ extern "C"
 {
 #include <stdio.h>
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 }
 
index c3f5266..5465bbf 100644 (file)
@@ -20,7 +20,7 @@
 extern "C"
 {
 #include <wchar.h>
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 namespace types
index eb16308..68b23f2 100644 (file)
@@ -28,7 +28,7 @@
 
 extern "C"
 {
-#include "os_wcsdup.h"
+#include "os_string.h"
 }
 
 namespace types
index f433b2f..09a1fdf 100644 (file)
@@ -29,7 +29,7 @@ extern "C"
 #include "Scierror.h"
 #include "sciprint.h"
 #include "sci_malloc.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 namespace types
index 3bb381f..2b4b367 100644 (file)
@@ -13,7 +13,7 @@
 extern "C"
 {
 #include "stdarg.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 #include "sciprint.h"
 }
@@ -85,8 +85,8 @@ types::Function::ReturnValue Overload::call(std::wstring _stOverloadingFunctionN
         wchar_t* pwstError = NULL;
         if (_isOperator)
         {
-            sprintf(pstError2, _("check or define function %s for overloading.\n"), pstFuncName);
-            sprintf(pstError1, "%s%s", _("Undefined operation for the given operands.\n"), pstError2);
+            os_sprintf(pstError2, _("check or define function %s for overloading.\n"), pstFuncName);
+            os_sprintf(pstError1, "%s%s", _("Undefined operation for the given operands.\n"), pstError2);
             pwstError = to_wide_string(pstError1);
             std::wstring wstError(pwstError);
             FREE(pwstError);
@@ -95,8 +95,8 @@ types::Function::ReturnValue Overload::call(std::wstring _stOverloadingFunctionN
         }
         else
         {
-            sprintf(pstError2, _("  check arguments or define function %s for overloading.\n"), pstFuncName);
-            sprintf(pstError1, "%s%s", _("Function not defined for given argument type(s),\n"), pstError2);
+            os_sprintf(pstError2, _("  check arguments or define function %s for overloading.\n"), pstFuncName);
+            os_sprintf(pstError1, "%s%s", _("Function not defined for given argument type(s),\n"), pstError2);
             pwstError = to_wide_string(pstError1);
             std::wstring wstError(pwstError);
             FREE(pwstError);
index 2a49947..f6e8080 100644 (file)
@@ -105,7 +105,7 @@ double* SinglePoly::allocData(int _iSize)
             m_pRealData = NULL;
             m_pImgData = NULL;
             char message[bsiz];
-            sprintf(message, _("Can not allocate negative size (%d).\n"),  _iSize);
+            os_sprintf(message, _("Can not allocate negative size (%d).\n"),  _iSize);
             ast::ScilabError se(message);
             se.SetErrorNumber(999);
             throw (se);
@@ -118,7 +118,7 @@ double* SinglePoly::allocData(int _iSize)
     catch (std::bad_alloc &/*e*/)
     {
         char message[bsiz];
-        sprintf(message, _("Can not allocate %.2f MB memory.\n"),  (double) (_iSize * sizeof(double)) / 1.e6);
+        os_sprintf(message, _("Can not allocate %.2f MB memory.\n"),  (double) (_iSize * sizeof(double)) / 1.e6);
         ast::ScilabError se(message);
         se.SetErrorNumber(999);
         throw (se);
index 2dbcba0..0db79f8 100644 (file)
@@ -20,7 +20,7 @@
 extern "C"
 {
 #include "charEncoding.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 }
 
@@ -157,7 +157,7 @@ bool String::subMatrixToString(wostringstream& ostr, int* _piDims, int /*_iDims*
 
         int iPos = getIndex(_piDims);
         wchar_t* wcsStr = get(iPos);
-        int iCurLen = wcslen(wcsStr);
+        int iCurLen = static_cast<int>(wcslen(wcsStr));
         iMaxLen = std::max(iMaxLen, iCurLen);
         iMaxLen = std::min(iMaxLen, iStrMaxSize);
 
@@ -219,7 +219,7 @@ bool String::subMatrixToString(wostringstream& ostr, int* _piDims, int /*_iDims*
             _piDims[0] = i;
             int iPos = getIndex(_piDims);
             wchar_t* wcsStr = get(iPos);
-            int iCurLen = wcslen(wcsStr);
+            int iCurLen = static_cast<int>(wcslen(wcsStr));
 
             ostr << L"!";
             if (iCurLen > iMaxLen)
@@ -373,7 +373,7 @@ bool String::subMatrixToString(wostringstream& ostr, int* _piDims, int /*_iDims*
                         _piDims[1] = iCols2;
                         int iPos = getIndex(_piDims);
                         wchar_t* wcsStr = get(iPos);
-                        int iLenStr = wcslen(wcsStr);
+                        int iLenStr = static_cast<int>(wcslen(wcsStr));
 
                         // Manage case where string length is greater than max line size.
                         if (iLenStr > iStrMaxSize)
@@ -461,7 +461,7 @@ bool String::subMatrixToString(wostringstream& ostr, int* _piDims, int /*_iDims*
                 _piDims[1] = iCols2;
                 int iPos = getIndex(_piDims);
                 wchar_t* wcsStr = get(iPos);
-                int iLenStr = wcslen(wcsStr);
+                int iLenStr = static_cast<int>(wcslen(wcsStr));
 
                 // Manage case where string length is greater than max line size.
                 if (iStrMaxSize < iLenStr)
@@ -483,7 +483,7 @@ bool String::subMatrixToString(wostringstream& ostr, int* _piDims, int /*_iDims*
                 {
                     configureStream(&ostemp, piSize[iCols2], iPrecision, ' ');
                     ostemp << left << get(iPos) << spaces;
-                    iLen += piSize[iCols2] + spaces.size();
+                    iLen += piSize[iCols2] + static_cast<int>(spaces.size());
                 }
             }
             ostemp << L"!" << endl;
index 3c00508..b1f57ba 100644 (file)
@@ -20,7 +20,7 @@
 extern "C"
 {
 #include "charEncoding.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 }
 
 namespace types
index 5eace3a..74e24dd 100644 (file)
@@ -26,7 +26,7 @@
 
 extern "C"
 {
-#include "os_wcsdup.h"
+#include "os_string.h"
 }
 
 namespace types
index 09376e0..6118d02 100644 (file)
@@ -20,7 +20,7 @@
 extern "C"
 {
 #include "elem_common.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 #define BLANK_SIZE 1
index f37af6f..d987dcb 100644 (file)
@@ -19,7 +19,7 @@ extern "C"
 {
 #include "localization.h"
 #include "charEncoding.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 
index c929f09..f70bc16 100644 (file)
@@ -16,7 +16,7 @@
 #include "execvisitor.hxx"
 extern "C"
 {
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 namespace types
index ad045a2..2c6c790 100644 (file)
@@ -116,7 +116,7 @@ types::Function::ReturnValue sci_and(types::typed_list &in, int _iRetCount, type
                 return types::Function::Error;
             }
 
-            opt = pdblIn->get(0);
+            opt = static_cast<int>(pdblIn->get(0));
             if (opt != pdblIn->get(0))
             {
                 Scierror(999, _("%s: Wrong value for input argument #%d: An integer value expected.\n"), "and", 2);
index e8aa86c..fc15a74 100644 (file)
@@ -114,17 +114,13 @@ types::Function::ReturnValue sci_or(types::typed_list &in, int _iRetCount, types
                 return types::Function::Error;
 
             }
-            opt = pdblIn->get(0);
+
+            opt = static_cast<int>(pdblIn->get(0));
             if (opt != pdblIn->get(0))
             {
                 Scierror(999, _("%s: Wrong value for input argument #%d: An integer value expected.\n"), "or", 2);
                 return types::Function::Error;
             }
-            /* if ((opt > OR_BY_COLUMNS) || (opt < OR_BY_ROWS))
-             {
-                 Scierror(44, _("%s: Wrong value for input argument #%d.\n"), "or", 2);
-                 return types::Function::Error;
-             }*/
         }
         else
         {
index 5e8b69d..73626a2 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/intl;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes../../libs/intl;../graphic_objects/includes;../string/includes;../console/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/intl;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../windows_tools/src/cpp/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes../../libs/intl;../graphic_objects/includes;../string/includes;../console/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -112,7 +112,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/intl;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes../../libs/intl;../graphic_objects/includes;../string/includes;../console/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/intl;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../windows_tools/src/cpp/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes../../libs/intl;../graphic_objects/includes;../string/includes;../console/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -142,7 +142,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/intl;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes../../libs/intl;../graphic_objects/includes;../string/includes;../console/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/intl;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../windows_tools/src/cpp/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes../../libs/intl;../graphic_objects/includes;../string/includes;../console/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -180,7 +180,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/intl;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes../../libs/intl;../graphic_objects/includes;../string/includes;../console/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/intl;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../windows_tools/src/cpp/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes../../libs/intl;../graphic_objects/includes;../string/includes;../console/includes;../ast/includes/types;../ast/includes/ast;../ast/includes/analysis;../ast/includes/exps;../ast/includes/operations;../ast/includes/symbol;../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index c858d5d..1b01361 100644 (file)
@@ -16,7 +16,7 @@
 #include "sci_malloc.h"
 #include "localization.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "api_scilab.h"
 #include "call_scilab_engine_state.h"
 #include "InitScilab.h"
@@ -61,7 +61,7 @@ int SendScilabJob(char *job)
         SetLastJob(command);
 
         /* Creation of a temp variable in Scilab which contains the command */
-        sciErr = createNamedMatrixOfString(NULL, "TMP_EXEC_STRING", 1, 1, (char const* const*) &command);
+        sciErr = createNamedMatrixOfString(NULL, "TMP_EXEC_STRING", 1, 1, (char const * const*) &command);
         if (sciErr.iErr)
         {
             printError(&sciErr, 0);
index 55fe30d..ba39f8e 100644 (file)
@@ -30,7 +30,7 @@
 #include "FigureList.h"
 #include "api_scilab.h"
 #include "call_scilab_engine_state.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "charEncoding.h"
 #include "InitScilab.h"
 #include "scilabRead.h"
index 6da9d14..29cdfd8 100644 (file)
@@ -52,6 +52,7 @@ libscicommons_la_CPPFLAGS= \
     -I$(top_srcdir)/modules/ast/includes/analysis/ \
     -I$(top_srcdir)/modules/localization/includes/ \
     -I$(top_srcdir)/modules/fileio/includes/ \
+    -I$(top_srcdir)/modules/string/includes/ \
     $(AM_CPPFLAGS)
 
 
index a88cbd5..582721c 100644 (file)
@@ -616,6 +616,7 @@ libscicommons_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/ast/includes/analysis/ \
     -I$(top_srcdir)/modules/localization/includes/ \
     -I$(top_srcdir)/modules/fileio/includes/ \
+    -I$(top_srcdir)/modules/string/includes/ \
     $(AM_CPPFLAGS)
 
 libscicommons_disable_la_SOURCES = $(COMMONS_DISABLE_C_SOURCES)
index e1fde4e..3cf7400 100644 (file)
@@ -85,7 +85,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../commons/includes;../../../api_scilab/includes;../../../fileio/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../commons/includes;../../../api_scilab/includes;../../../fileio/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMMONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../commons/includes;../../../api_scilab/includes;../../../fileio/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../commons/includes;../../../api_scilab/includes;../../../fileio/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMMONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../commons/includes;../../../api_scilab/includes;../../../fileio/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../commons/includes;../../../api_scilab/includes;../../../fileio/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMMONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../commons/includes;../../../api_scilab/includes;../../../fileio/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../commons/includes;../../../api_scilab/includes;../../../fileio/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMMONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 1084fb3..0388f4a 100644 (file)
@@ -22,6 +22,7 @@
 #endif
 
 #include "sci_malloc.h"
+#include "os_string.h"
 
 #include "PATH_MAX.h"
 #include "scicurdir.h"
@@ -40,7 +41,7 @@ int isEmptyDirectory(char *dirName)
     int ret = 1;
 
     wcpath = to_wide_string(dirName);
-    swprintf(wdirpath, wcslen(wcpath) + 2 + 1, L"%s\\*", wcpath);
+    os_swprintf(wdirpath, wcslen(wcpath) + 2 + 1, L"%s\\*", wcpath);
     FREE(wcpath);
 
     hFile = FindFirstFileW(wdirpath, &FileInformation);
index 24467a2..c61dd03 100644 (file)
 #include <ctype.h>
 #include "completeLine.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "getPartLine.h"
 #include "splitpath.h"
 #include "PATH_MAX.h"
-#include "stricmp.h"
 #include "stristr.h"
 
 /*--------------------------------------------------------------------------*/
index 104fb77..b6e9be5 100644 (file)
@@ -23,7 +23,7 @@
 #include "getDictionarySetProperties.h"
 #include "getDictionaryGetProperties.h"
 #include "toolsdictionary.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "stdio.h"
 /*--------------------------------------------------------------------------*/
 char **completionOnDictionary(char **dictionary, int sizedictionary, const char *somechars, int *sizearrayreturned);
index 329fab2..cdeefa5 100644 (file)
@@ -12,8 +12,7 @@
 #include <string.h>
 #include "completion_generic.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
-#include "stricmp.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 char **completion_generic(char **dictionary, int sizedictionary,
                           const char *somechars, int *sizeArrayReturned)
index 2c28571..0ec764d 100644 (file)
@@ -16,7 +16,7 @@
 #include "getCommonPart.h"
 #include "core_math.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static int cmp( const void *a , const void *b)
 {
index ff12c15..183cc5b 100644 (file)
@@ -11,7 +11,7 @@
 */
 /*--------------------------------------------------------------------------*/
 #include <string.h>
-#include "os_strdup.h"
+#include "os_string.h"
 #include "getPartLine.h"
 #include "core_math.h"
 #include "sci_malloc.h"
index c419656..72393bf 100644 (file)
@@ -21,7 +21,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 namespace org_modules_completion
index b0898c0..688cbe0 100644 (file)
@@ -21,7 +21,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "completion.h"
 }
 
index 9a07810..837f4a9 100644 (file)
@@ -21,7 +21,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 namespace org_modules_completion
index b990026..5b74e4f 100644 (file)
@@ -23,7 +23,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 namespace org_modules_completion
index b290154..b11646d 100644 (file)
@@ -24,7 +24,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 namespace org_modules_completion
index 47d9813..531eb5e 100644 (file)
@@ -23,7 +23,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 using namespace org_modules_xml;
index c4ce7f3..fbb1931 100644 (file)
@@ -20,7 +20,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 namespace org_modules_completion
index 3fb14cd..456f241 100644 (file)
@@ -23,7 +23,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 using namespace org_modules_xml;
index 90d7cf0..ebcf033 100644 (file)
@@ -23,7 +23,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 using namespace org_modules_xml;
index c306e0e..1249eab 100644 (file)
@@ -23,7 +23,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 using namespace org_modules_xml;
index bd52e9f..3c04286 100644 (file)
@@ -34,7 +34,7 @@
 #include "initConsoleMode.h"
 #include "GetCommandLine.h"
 #include "TermReadAndProcess.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "BrowseVarManager.h"
 #include "scicurdir.h"
 #include "FileBrowserChDir.h"
index 7b7f7ef..ad6a1bb 100644 (file)
@@ -20,9 +20,8 @@
 #include "storeCommand.h" /* storecommand */
 #include "FindFileExtension.h"
 #include "URIFileToFilename.h"
-#include "stricmp.h"
 #include "with_module.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "charEncoding.h"
 /*--------------------------------------------------------------------------*/
 #define BIN_EXTENSION_FILE ".bin"
index 3e0f8e7..267a63e 100644 (file)
@@ -17,7 +17,7 @@
 #include "configvariable_interface.h"
 #include "localization.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "BOOL.h"
 /*------------------------------------------------------------------------*/
 static char Sci_Prompt[PROMPT_SIZE_MAX];
index 8cae886..b9e5aab 100644 (file)
@@ -16,7 +16,7 @@
 #include "basout.h"
 #include "sci_malloc.h"
 #include "prompt.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 int C2F(promptecho)(int *lunit, char *string, int *strl, int string_len)
 {
index 3856f6f..b876693 100644 (file)
@@ -23,7 +23,7 @@
 #include "getCommonPart.h"
 #include "completion.h"
 #include "scilines.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "completeLine.h"
 /*--------------------------------------------------------------------------*/
 static void displayCompletionDictionary(char **dictionary, int sizedictionary, char *namedictionary);
index 84a9a89..0f9cc1a 100644 (file)
@@ -17,7 +17,7 @@
 #include "sci_malloc.h"
 #include "TermCommand.h"
 #include "FocusOnConsole.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "TermCompletion.h"
 #include "TermLine.h"
 #include "scilines.h"
index 281b6cb..697c25b 100644 (file)
@@ -23,7 +23,7 @@
 #include "sci_malloc.h"
 #include "TermPosition.h"
 #include "../../../windows_tools/src/c/scilab_windows/console.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static int CURRENT_MAX_LINE_SIZE = bsiz;
 static char *cur_line = NULL;  /* current contents of the line */
index f451d8f..b8dd82a 100644 (file)
@@ -16,7 +16,7 @@
 /*--------------------------------------------------------------------------*/
 #include "CallScilabBridge.hxx"
 
-#include "os_strdup.h"
+#include "os_string.h"
 
 using namespace  org_scilab_modules_gui_bridge;
 /*--------------------------------------------------------------------------*/
index bce8075..d2abf38 100644 (file)
@@ -19,7 +19,7 @@ extern "C"
 #include "SetConsolePrompt.h"
 #include "prompt.h"
 #include "TermReadAndProcess.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "configvariable_interface.h"
 #include "localization.h"
 #include "diary.h"
index 71825fb..d5c0506 100644 (file)
@@ -19,7 +19,7 @@ extern "C"
 #include "configvariable_interface.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 }
 /*--------------------------------------------------------------------------*/
index ff81cd2..733156e 100644 (file)
@@ -21,7 +21,7 @@ extern "C"
 {
 #include "Scierror.h"
 #include "localization.h"
-#include "os_wcsicmp.h"
+#include "os_string.h"
 }
 /*--------------------------------------------------------------------------*/
 types::Function::ReturnValue sci_intppty(types::typed_list &in, int _iRetCount, types::typed_list &out)
index cf1cefd..8a4f2b9 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "sci_malloc.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 /*--------------------------------------------------------------------------*/
 
index 22a8d04..d2d202a 100644 (file)
@@ -13,7 +13,7 @@
 #include "GetXmlFileEncoding.h"
 #include "libxml/xmlreader.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "BOOL.h"
 #include "getshortpathname.h"
 /*--------------------------------------------------------------------------*/
index c0eb38e..26f4c22 100644 (file)
@@ -17,7 +17,7 @@
 #include "setieee.h"
 #include "setlines.h"
 #include "setformat.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "TerminateHistoryManager.h"
 #include "InitializeHistoryManager.h"
 #include "HistoryManager.h"
index 192deaa..83cdb06 100644 (file)
@@ -13,7 +13,7 @@
 #include "commandwords.h"
 #include "sci_malloc.h"
 #include "BOOL.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 
 /*--------------------------------------------------------------------------*/
index 00c1892..f365282 100644 (file)
@@ -13,7 +13,7 @@
 #include <string.h>
 #include "getcommandlineargs.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static int scilab_nbargs = 0;
 static char *scilab_argv[MAXCMDTOKENS];
index 0993614..8c47537 100644 (file)
@@ -24,7 +24,7 @@
 #include "getos.h"
 #include "api_scilab.h"
 #include "charEncoding.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "getVideoAdapters.h"
 #include "freeArrayOfString.h"
 #include "GetWindowsVersion.h"
index 523dfe8..2845d63 100644 (file)
 #include "sci_path.h"
 #include "localization.h"
 #include "string.h"
-#include "stricmp.h"
 #include "sciprint.h"
 #include "GetXmlFileEncoding.h"
 #include "scilabDefaults.h"
 #include "FileExist.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "getshortpathname.h"
 /*--------------------------------------------------------------------------*/
 static struct MODULESLIST *ScilabModules = NULL;
index 0a70236..4dbad59 100644 (file)
@@ -21,7 +21,7 @@
 #endif
 #include "getos.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 /*--------------------------------------------------------------------------*/
 char *getOSFullName(void)
index 599a521..c61bca6 100644 (file)
 #include "configvariable_interface.h"
 #include "scilabDefaults.h"
 #include "getenvc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "with_module.h"
 #include "loadversion.h"
 #include "freeArrayOfString.h"
 #include "sci_malloc.h"
 #include "../../../io/includes/getenvc.h"
-#include "os_wcsdup.h"
 #include "charEncoding.h"
 
 /*--------------------------------------------------------------------------*/
index 2ba21fb..84ec89b 100644 (file)
@@ -22,9 +22,8 @@
 #include "GetXmlFileEncoding.h"
 #include "scilabDefaults.h"
 #include "localization.h"
-#include "stricmp.h"
 #include "FileExist.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "getshortpathname.h"
 #include "charEncoding.h"
 #include "version.h"
index ed18e71..df6fdc7 100644 (file)
@@ -24,7 +24,7 @@
 #include "sci_malloc.h"
 #include "GetXmlFileEncoding.h"
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "getshortpathname.h"
 #include "BOOL.h"
 /*--------------------------------------------------------------------------*/
index 65f19d9..3d0d6da 100644 (file)
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 
 #include "getScilabPreference.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "scicurdir.h"
 #include "sci_malloc.h"
 
index 540c8ef..faf3aed 100644 (file)
@@ -12,7 +12,7 @@
 /*--------------------------------------------------------------------------*/
 #include <string.h>
 #include "transposeMatrix.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 /*--------------------------------------------------------------------------*/
 double *transposeMatrixDouble(int C, int L, double *MatrixDouble)
index 6687aad..d715a5b 100644 (file)
@@ -26,7 +26,7 @@ extern "C" {
 #include "backtrace.h"
 #include "backtrace_print.h"
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 #ifdef _MSC_VER
index 6eecbf2..6d3b2b9 100644 (file)
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "machine.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 #include "localization.h"
 /*---------------------------------------------------------------------------*/
index 529abac..37092dd 100644 (file)
@@ -15,7 +15,7 @@
 #include "charEncoding.h"
 #include "sci_malloc.h"
 #include "machine.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 /*---------------------------------------------------------------------------*/
 DynLibHandle LoadDynLibraryW(wchar_t *libname)
 {
index c5d121f..0d01edd 100644 (file)
@@ -23,7 +23,7 @@ extern "C"
 {
 #include "Scierror.h"
 #include "localization.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 using namespace types;
index 9f16b4b..5bbaa95 100644 (file)
@@ -26,7 +26,7 @@ extern "C"
 #ifdef _MSC_VER
 #include <Windows.h>
 #endif
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 #include "ScilabAbstractEnvironment.hxx"
index 4695b7d..b775c78 100644 (file)
@@ -21,7 +21,7 @@
 #include "localization.h"
 #include "freeArrayOfString.h"
 #include "Scierror.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 /* fftw_flags function.
 *
index d04dc5e..e6f1816 100644 (file)
@@ -13,7 +13,7 @@
 #include "stdlib.h"
 #include "fftwlibname.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static char *fftwlibname = NULL;
 /*--------------------------------------------------------------------------*/
index ce078dc..4349ae6 100644 (file)
@@ -18,7 +18,7 @@
 #include "localization.h"
 #include "freeArrayOfString.h"
 #include "expandPathVariable.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "fprintfMat.h"
 
 static void freeVar(char** filename, char** expandedFilename, char*** textAdded, int m4n4, char** Format, char** separator);
index 745d866..dd1d68d 100644 (file)
@@ -19,7 +19,7 @@
 #include "localization.h"
 #include "freeArrayOfString.h"
 #include "expandPathVariable.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "fscanfMat.h"
 
 /*--------------------------------------------------------------------------*/
@@ -204,7 +204,7 @@ int sci_fscanfMat(char *fname, void* pvApiCtx)
             {
                 if (results->text)
                 {
-                    sciErr = createMatrixOfString(pvApiCtx, Rhs + 2, results->sizeText, 1, (char const* const*) results->text);
+                    sciErr = createMatrixOfString(pvApiCtx, Rhs + 2, results->sizeText, 1, (char const * const*) results->text);
                     if (sciErr.iErr)
                     {
                         FREE(filename);
index 93580f4..b68f8ef 100644 (file)
@@ -23,7 +23,7 @@ extern "C"
 #include "machine.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "os_wcsicmp.h"
+#include "os_string.h"
 }
 
 using namespace types;
index 7a058a2..e2a5955 100644 (file)
@@ -25,7 +25,7 @@ extern "C"
 #include "Scierror.h"
 #include "expandPathVariable.h"
 #include "PATH_MAX.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "scicurdir.h"
 #include "freeArrayOfString.h"
 }
index 3ce815e..d98b189 100644 (file)
@@ -22,7 +22,7 @@ extern "C"
 #include "Scierror.h"
 #include "localization.h"
 #include "mclose.h"
-#include "os_wcsicmp.h"
+#include "os_string.h"
 }
 #include "stdio.h"
 
index 28a007a..4f0b652 100644 (file)
@@ -25,7 +25,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "charEncoding.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 using namespace types;
index 0f1543a..0ccddcb 100644 (file)
@@ -26,7 +26,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "charEncoding.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 using namespace types;
index d7aa4fd..7c43c1e 100644 (file)
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <stdio.h>
 #endif
-#include "os_strdup.h"
+#include "os_string.h"
 #include "FindFileExtension.h"
 #include "sci_malloc.h"
 #include "charEncoding.h"
index b7ea5e5..fa994f3 100644 (file)
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include "URIFileToFilename.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #if _MSC_VER
 #define strnicmp _strnicmp
index d38ecc6..22e67b0 100644 (file)
@@ -30,7 +30,7 @@
 #include "createdirectory.h"
 #include "PATH_MAX.h"
 #include "fullpath.h"
-#include "os_wcsicmp.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static int CopyFileFunction_others(wchar_t *DestinationFilename, wchar_t *SourceFilename);
 static int CopyDirectoryFunction_others(wchar_t *DestinationDirectory, wchar_t *SourceDirectory);
index 9577c62..5ead0ab 100644 (file)
 #include "isdir.h"
 #include "createdirectory.h"
 #include "PATH_MAX.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static int CopyFileFunction_windows(wchar_t *DestinationFilename, wchar_t *SourceFilename);
 static int CopyDirectoryFunction_windows(wchar_t *DestinationDirectory, wchar_t *SourceDirectory);
 /*--------------------------------------------------------------------------*/
 int CopyFileFunction(wchar_t *DestinationFilename, wchar_t *SourceFilename)
 {
-    if (_wcsicmp(DestinationFilename, SourceFilename) == 0)
+    if (os_wcsicmp(DestinationFilename, SourceFilename) == 0)
     {
         SetLastError(ERROR_ACCESS_DENIED);
         return 1;
@@ -51,7 +52,7 @@ int CopyDirectoryFunction(wchar_t *DestinationDirectory, wchar_t *SourceDirector
         DestinationDirectory[wcslen(DestinationDirectory) - 1] = L'\0';
     }
 
-    if (_wcsicmp(DestinationDirectory, SourceDirectory) == 0)
+    if (os_wcsicmp(DestinationDirectory, SourceDirectory) == 0)
     {
         SetLastError(ERROR_ACCESS_DENIED);
         return 1;
index e50993c..249b31e 100644 (file)
@@ -26,7 +26,7 @@
 #include "getshortpathname.h"
 #include "FileExist.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 char *createtempfilename(const char *prefix, BOOL bShortFormat)
 {
index 5f818d8..881d2a9 100644 (file)
@@ -29,7 +29,7 @@
 #include "scicurdir.h"
 #include "splitpath.h"
 #include "getScilabPreference.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "freeArrayOfString.h"
 /* ==================================================================== */
 #ifndef HAVE_BASENAME
index 9ac4594..4bf77a8 100644 (file)
@@ -24,6 +24,7 @@
 #include "Scierror.h"
 #include "localization.h"
 #include "core_math.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 typedef int (*XXSCANF) (FILE *, wchar_t *, ...);
 typedef int (*FLUSH) (FILE *);
@@ -372,7 +373,7 @@ int do_xxscanf (const wchar_t *fname, FILE *fp, const wchar_t *format, int *narg
                )
             {
                 f2--;
-                n = swprintf(f2, MAX_STR - 1, L"%d%c", MAX_STR - 1, L'l');
+                n = os_swprintf(f2, MAX_STR - 1, L"%d%c", MAX_STR - 1, L'l');
                 f2 += n;
                 *f2++ = *f1++;
             }
index 5876f6a..3da9056 100644 (file)
@@ -21,7 +21,7 @@
 #include "charEncoding.h"
 #include "sci_malloc.h"
 #include "returnanan.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "expandPathVariable.h"
 
 /*--------------------------------------------------------------------------*/
index ce0c782..72af393 100644 (file)
@@ -16,7 +16,7 @@
 #include "filesmanagement.h"
 #include "core_math.h" /* Min Max */
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "fullpath.h"
 /*--------------------------------------------------------------------------*/
 typedef struct
index d3ea23e..0240281 100644 (file)
@@ -23,9 +23,7 @@
 #include "sci_malloc.h"
 #include "localization.h"
 #include "sciprint.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "charEncoding.h"
 /*--------------------------------------------------------------------------*/
 #ifndef _MSC_VER
index ea110cd..7d2bcd4 100644 (file)
@@ -23,7 +23,7 @@
 #include "core_math.h"
 #include "strsubst.h"
 #include "BOOL.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 /*--------------------------------------------------------------------------*/
 #define EOL "\n"
index 5104b53..71e7f52 100644 (file)
@@ -24,7 +24,7 @@
 #include "BOOL.h"
 #include "localization.h"
 #include "Scierror.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "freeArrayOfString.h"
 #include "mgetl.h"
 #include "mopen.h"
@@ -87,7 +87,7 @@ fscanfMatResult *fscanfMat(char *filename, char *format, char *separator)
     char **lines = NULL;
     int nblines = 0;
     double *dValues = NULL;
-       wchar_t* filenameW = NULL;
+    wchar_t* filenameW = NULL;
 
     if ((filename == NULL) || (format == NULL) || (separator == NULL))
     {
index fc261c3..196a913 100644 (file)
@@ -17,7 +17,7 @@
 #include "getlongpathname.h"
 #include "sci_malloc.h"
 #include "charEncoding.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #ifdef _MSC_VER
 #ifndef MAX_PATH_LONG
index 44786e5..0c644c8 100644 (file)
@@ -15,8 +15,7 @@
 #include "getshortpathname.h"
 #include "sci_malloc.h"
 #include "charEncoding.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #ifdef _MSC_VER
 #include <Windows.h> /* GetShortPathNameW */
index 1cdc85f..88f2da1 100644 (file)
@@ -25,8 +25,7 @@
 #include "isdir.h"
 #include "sci_malloc.h"
 #include "charEncoding.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 BOOL isdir(const char * path)
 {
index dcb8def..5f38a38 100644 (file)
@@ -31,7 +31,7 @@
 #include "isdir.h"
 #include "sci_malloc.h"
 #include "charEncoding.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #ifdef _MSC_VER
 static int DeleteDirectory(wchar_t *refcstrRootDirectory);
index 5026a45..11fa000 100644 (file)
@@ -24,8 +24,7 @@ extern "C"
 #include "PATH_MAX.h"
 #include "api_scilab.h"
 #include "getlongpathname.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 }
 
 
index 8dd6181..34119e0 100644 (file)
@@ -14,7 +14,7 @@
 
 extern "C"
 {
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include <stdio.h>
 }
 
index 7cee344..a906006 100644 (file)
@@ -23,8 +23,7 @@ extern "C"
 #include "filesmanagement.h"
 #include "mopen.h"
 #include "sci_malloc.h"
-#include "os_wcsdup.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "mtell.h"
 #include "mseek.h"
 #include "sciprint.h"
index e1f0f6b..973a903 100644 (file)
 
 extern "C"
 {
-    //#include "PATH_MAX.h"
-    //#include "gw_io.h"
 #include "sci_malloc.h"
-    //#include "sciprint.h"
-    //#include "stack-c.h"
 #include "expandPathVariable.h"
-    //#include "Scierror.h"
-    //#include "localization.h"
-    //#include "freeArrayOfString.h"
 #include "charEncoding.h"
-    //#include "os_strdup.h"
 #include "newest.h"
 }
 
index aa5bebf..9e99b3d 100644 (file)
 
 extern "C"
 {
-#include "os_wcsicmp.h"
+#include "os_string.h"
 #include "expandPathVariable.h"
 #include "prompt.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "mopen.h"
 #include "mclose.h"
 #include "fullpath.h"
index be046a4..e05009e 100644 (file)
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_wcsicmp.h"
+#include "os_string.h"
 #include "Scierror.h"
 #include "sciprint.h"
 #include "localization.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 #define MUTE_FLAG       L"n"
index 1e8e19d..a3c2d07 100644 (file)
@@ -34,10 +34,7 @@ extern "C"
 {
 #include "findfiles.h"
 #include "configvariable_interface.h"
-#ifndef _MSC_VER
-#include "stricmp.h"
-#endif
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 
index 9938061..5662a8b 100644 (file)
@@ -23,7 +23,7 @@ extern "C"
 #include "deleteGraphicObject.h"
 
 #include "gw_graphic_export.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 /*--------------------------------------------------------------------------*/
index 5bb381c..9487d4c 100644 (file)
@@ -15,7 +15,7 @@
 extern "C"
 {
 #include "FigureList.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "FigureList.h"
 }
 
index 20d17c1..f6b63b0 100644 (file)
@@ -45,7 +45,7 @@
 #include "sciprint.h"
 #include "createGraphicObject.h"
 
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 int sci_delete(char *fname, void* pvApiCtx)
 {
index 6c74a7a..5d4bd3b 100644 (file)
@@ -16,7 +16,7 @@
 #include "localization.h"
 #include "HandleManagement.h"
 #include "BuildObjects.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 int sci_light(char *fname, void* pvApiCtx)
 {
index df5d7b7..7aec0d4 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "sci_malloc.h"             /* MALLOC */
 #include "localization.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "api_scilab.h"
 #include "FigureList.h"
 
index 1842259..4a17106 100644 (file)
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "InitObjects.h"
 #include "SetProperty.h"
index 29d9624..a9e01c5 100644 (file)
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "SetProperty.h"
 #include "GetProperty.h"
index c85e44c..147ca88 100644 (file)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include "StringMatrix.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 
 /*----------------------------------------------------------------------------------*/
index f99f6ca..db40141 100755 (executable)
@@ -22,7 +22,7 @@
 #include "localization.h"
 #include "getDictionarySetProperties.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "BOOL.h"
 
 /**
index 2b5412e..8e4c940 100644 (file)
@@ -23,8 +23,7 @@
 #include "BasicAlgos.h"
 #include "freeArrayOfString.h"
 #include "Scierror.h"
-#include "stricmp.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 void copyDoubleVectorToIntFromStack(void* _pvData, int* _piDest, int _iNbItem)
 {
index efdb642..7689fb8 100644 (file)
@@ -27,7 +27,7 @@
 #include "Scierror.h"
 #include "localization.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "getGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
index 0a1612c..86b564a 100644 (file)
@@ -25,7 +25,7 @@
 #include "Scierror.h"
 #include "localization.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "getGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
index 09080e6..bc73058 100644 (file)
@@ -26,7 +26,7 @@
 #include "Scierror.h"
 #include "localization.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "getGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
index 9bc2aeb..889900b 100644 (file)
@@ -28,7 +28,7 @@
 #include "Scierror.h"
 #include "localization.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "getGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
index 5b2507d..b615e43 100644 (file)
 /*------------------------------------------------------------------------*/
 #include <string.h>
 #include <ctype.h>
-#include "stricmp.h"
 
 #include "setGetHashTable.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 /* see http://www.cse.yorku.ca/~oz/hash.html */
 /* like in hashtable_localization by Allan Cornet */
index ada1d60..8e69a89 100644 (file)
@@ -18,7 +18,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index d1ee121..1ab53ec 100644 (file)
@@ -20,7 +20,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index f009c6c..17f2dc1 100644 (file)
@@ -18,7 +18,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "GetProperty.h"
index e638664..d0ea444 100644 (file)
@@ -22,7 +22,7 @@
 #include "localization.h"
 #include "SetPropertyStatus.h"
 #include "sci_types.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 #include "createGraphicObject.h"
 #include "deleteGraphicObject.h"
index c6bfb52..d857e17 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index 84f03c0..ac427df 100644 (file)
@@ -20,7 +20,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index 5d8c2bf..d065511 100644 (file)
@@ -20,7 +20,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "GetProperty.h"
index 61cac7f..c62e120 100644 (file)
@@ -22,7 +22,7 @@
 #include "localization.h"
 #include "SetPropertyStatus.h"
 #include "sci_types.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 #include "setGraphicObjectProperty.h"
 #include "getGraphicObjectProperty.h"
index e67a720..334cf25 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index f7d00fd..bb1be18 100644 (file)
@@ -19,7 +19,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index b088aeb..9f7b52f 100644 (file)
@@ -17,7 +17,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index 9c300f1..80defad 100644 (file)
@@ -26,7 +26,7 @@
 #include "getGraphicObjectProperty.h"
 #include "setGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 #include "Matplot.h"
 
index 3d03d46..7e949c0 100644 (file)
@@ -22,7 +22,6 @@
 #include "localization.h"
 #include "SetPropertyStatus.h"
 #include "sci_types.h"
-#include "stricmp.h"
 
 #include "setGraphicObjectProperty.h"
 #include "getGraphicObjectProperty.h"
index 38e27f2..b7b3246 100644 (file)
@@ -20,7 +20,7 @@
 #include "localization.h"
 #include "SetPropertyStatus.h"
 #include "sci_types.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 #include "setGraphicObjectProperty.h"
 #include "getGraphicObjectProperty.h"
index 38993c4..d075e50 100644 (file)
@@ -16,7 +16,7 @@
 #include "SetPropertyStatus.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 #include "setGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
index 54d1f1b..3744608 100644 (file)
@@ -19,7 +19,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index 63df14b..4a290b4 100644 (file)
@@ -18,7 +18,7 @@
 #include "SetPropertyStatus.h"
 #include "GetProperty.h"
 #include "BOOL.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "BarType.h"
 #include "setGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
index 23ce5f0..6e68108 100644 (file)
@@ -19,7 +19,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index f83adf5..a345400 100644 (file)
@@ -17,8 +17,6 @@
 #include "SetPropertyStatus.h"
 #include "GetProperty.h"
 #include "BOOL.h"
-#include "stricmp.h"
-
 #include "setGraphicObjectProperty.h"
 #include "getGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
index 5038afe..df4124f 100644 (file)
@@ -18,7 +18,7 @@
 #include "GetProperty.h"
 #include "BOOL.h"
 #include "TitlePositionType.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 #include "setGraphicObjectProperty.h"
 #include "getGraphicObjectProperty.h"
index 34505c9..eded3be 100644 (file)
@@ -19,7 +19,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index 431610a..2cfdc2d 100644 (file)
@@ -19,7 +19,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index 1ceae01..094dada 100644 (file)
@@ -19,7 +19,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index 1edccba..1d262a1 100644 (file)
@@ -18,7 +18,7 @@
 #include "SetPropertyStatus.h"
 #include "GetProperty.h"
 #include "BOOL.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "BarType.h"
 #include "setGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
index e2d6a64..901783e 100644 (file)
@@ -20,7 +20,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index 4fa3c1e..b504f98 100644 (file)
@@ -20,7 +20,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index e01fda8..746fe45 100644 (file)
@@ -20,7 +20,7 @@
 /*        a handle                                                        */
 /*------------------------------------------------------------------------*/
 
-#include "stricmp.h"
+#include "os_string.h"
 #include "setHandleProperty.h"
 #include "SetProperty.h"
 #include "getPropertyAssignedValue.h"
index 2f72cad..a160dc6 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 #include "name2rgb.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 static char* colorName[] =
 {
index 394beaf..f2fa38c 100644 (file)
@@ -29,7 +29,7 @@
 #include "graphicObjectProperties.h"
 #include "checkColorRange.h"
 #include "getPropertyAssignedValue.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 GUI_IMPEXP int SetUicontrolIcon(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol);
 GUI_IMPEXP int SetUicontrolBackgroundColor(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol);
index e47e2df..e090e55 100644 (file)
@@ -24,7 +24,7 @@
 #include "localization.h"
 #include "freeArrayOfString.h"
 #include "CallClipboard.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "FigureList.h"
 
 /*--------------------------------------------------------------------------*/
index 1b00082..d9d102f 100644 (file)
@@ -28,9 +28,7 @@
 #include "FigureModel.h"
 #include "HandleManagement.h"
 #include "SetHashTable.h"
-#include "stricmp.h"
-#include "os_strdup.h"
-
+#include "os_string.h"
 #include "sciprint.h"
 #include "addColor.h"
 
index ef4fd21..eee26f0 100644 (file)
@@ -16,7 +16,7 @@
 #include "CallMessageBox.h"
 #include "Scierror.h"
 #include "getPropertyAssignedValue.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "messageboxoptions.h"
 
 /*--------------------------------------------------------------------------*/
@@ -92,7 +92,7 @@ int sci_messagebox(char *fname, void* pvApiCtx)
                 return 1;
             }
 
-            if (nbRow*nbCol != 1)
+            if (nbRow * nbCol != 1)
             {
                 Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), fname, 2);
                 return FALSE;
@@ -130,7 +130,7 @@ int sci_messagebox(char *fname, void* pvApiCtx)
                 return 1;
             }
 
-            if (nbRow*nbCol == 1)
+            if (nbRow * nbCol == 1)
             {
                 /* The icon argument can be used to give the modal option or the buttons names */
                 if (isModalOption(iconAdr[0]))
@@ -180,7 +180,7 @@ int sci_messagebox(char *fname, void* pvApiCtx)
                 return 1;
             }
 
-            if (nbRow*nbCol == 1)
+            if (nbRow * nbCol == 1)
             {
                 /* The buttons names argument can be used to give the modal option */
                 if (isModalOption(buttonsTextAdr[0]))
@@ -216,7 +216,7 @@ int sci_messagebox(char *fname, void* pvApiCtx)
                 return 1;
             }
 
-            if (nbRow*nbCol != 1)
+            if (nbRow * nbCol != 1)
             {
                 Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), fname, 5);
                 return FALSE;
index bf87ef3..a35b594 100644 (file)
@@ -21,7 +21,7 @@
 #include "HandleManagement.h"
 #include "GetProperty.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "configvariable_interface.h"
 #include "getGraphicObjectProperty.h"
 #include "setGraphicObjectProperty.h"
index bf69b7d..9fa5aaf 100644 (file)
@@ -20,7 +20,6 @@
 #include "HandleManagement.h"
 #include "sci_malloc.h"             /* MALLOC */
 #include "localization.h"
-#include "stricmp.h"
 #include "SetPropertyStatus.h"
 #include "SetHashTable.h"
 #include "Scierror.h"
@@ -35,7 +34,7 @@
 #include "api_scilab.h"
 #include "createGraphicObject.h"
 #include "expandPathVariable.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 static const char* propertiesNames[] =
 {
index 3e45a62..1e0977a 100644 (file)
@@ -25,7 +25,7 @@
 #include "SetHashTable.h"
 #include "localization.h"
 #include "Scierror.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "CreateUimenu.h"
 #include "createGraphicObject.h"
 #include "setGraphicObjectProperty.h"
index 3644aba..4b0f864 100644 (file)
@@ -22,7 +22,7 @@ extern "C"
 #include "HandleManagement.h"
 #include "getGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
-#include "stricmp.h"
+#include "os_string.h"
 }
 
 using namespace org_scilab_modules_gui_datatip;
index 340243c..be3c2f0 100644 (file)
@@ -29,7 +29,7 @@ extern "C"
 #include "Scierror.h"
 #include "sci_malloc.h"
 #include "getScilabJavaVM.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 /*--------------------------------------------------------------------------*/
index dc495e3..9b850a4 100644 (file)
@@ -31,7 +31,7 @@ extern "C"
 #include "Scierror.h"
 #include "expandPathVariable.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "BOOL.h"
 }
 /*--------------------------------------------------------------------------*/
index ea36d32..503d79f 100644 (file)
@@ -29,7 +29,7 @@ extern "C"
 #include "Scierror.h"
 #include "expandPathVariable.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "BOOL.h"
 }
 using namespace org_scilab_modules_gui_filechooser;
index 9afbbbf..ef3c9de 100644 (file)
@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include "buildMainWindowTitle.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #ifdef _MSC_VER
 #include "../../../windows_tools/src/c/scilab_windows/buildMainWindowTitle_Windows.h"
 #endif
index 573379e..69e03e5 100644 (file)
@@ -16,7 +16,7 @@
 #include "getScilabJNIEnv.h"
 #include "getScilabObject.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 char * getMainWindowTitle(void)
 {
index 1f1e3d8..3b9f83a 100644 (file)
@@ -11,7 +11,7 @@
  */
 
 #include "messageboxoptions.h"
-#include "stricmp.h"
+#include "os_string.h"
 
 /*--------------------------------------------------------------------------*/
 
index 28abef0..a6bd840 100644 (file)
@@ -22,7 +22,7 @@ extern "C"
 #include "getScilabJavaVM.h"
 #include "GetProperty.h"
 #include "SetPropertyStatus.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "returnProperty.h"
 #include "GetScreenProperty.h"
 #include "localization.h"
index 7e6dc24..b7f862d 100644 (file)
@@ -31,7 +31,7 @@ extern "C"
 #include "h5_readDataFromFile.h"
 #include "h5_attributeConstants.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "configvariable_interface.h"
 #include "splitpath.h"
 #include "scicurdir.h"
@@ -818,23 +818,23 @@ static bool export_ints(int* pvCtx, int _iH5File, int *_piVar, char* _pstName)
             iRet = writeUnsignedInteger32Matrix(_iH5File, _pstName, 2, piDims, (unsigned int*)piData);
             break;
         case SCI_INT64 :
-        //sciErr = getMatrixOfInteger64(_piVar, &piDims[0], &piDims[1], (long long**)&piData);
-        //if(sciErr.iErr)
-        //{
-        //     printError(&sciErr, 0);
-        //     return false;
-        //}
-        //iRet = writeInteger64Matrix(_iH5File, _pstName, 2, piDims, (long long*)piData);
-        //break;
+            //sciErr = getMatrixOfInteger64(_piVar, &piDims[0], &piDims[1], (long long**)&piData);
+            //if(sciErr.iErr)
+            //{
+            // printError(&sciErr, 0);
+            // return false;
+            //}
+            //iRet = writeInteger64Matrix(_iH5File, _pstName, 2, piDims, (long long*)piData);
+            //break;
         case SCI_UINT64 :
-        //sciErr = getMatrixOfUnsignedInteger64(_piVar, &piDims[0], &piDims[1], (unsigned long long**)&piData);
-        //if(sciErr.iErr)
-        //{
-        //     printError(&sciErr, 0);
-        //     return false;
-        //}
-        //iRet = writeUnsignedInteger64Matrix(_iH5File, _pstName, 2, piDims, (unsigned long long*)piData);
-        //break;
+            //sciErr = getMatrixOfUnsignedInteger64(_piVar, &piDims[0], &piDims[1], (unsigned long long**)&piData);
+            //if(sciErr.iErr)
+            //{
+            // printError(&sciErr, 0);
+            // return false;
+            //}
+            //iRet = writeUnsignedInteger64Matrix(_iH5File, _pstName, 2, piDims, (unsigned long long*)piData);
+            //break;
         default :
             return 1;
             break;
index 2861bf6..f567c8f 100644 (file)
@@ -21,7 +21,7 @@
 #include "splitpath.h"
 #include "scicurdir.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static char *getPathFilename(char *fullfilename);
 static char *getFilenameWithExtension(char *fullfilename);
index 29611d8..2c41f98 100644 (file)
@@ -18,7 +18,7 @@
 #include "H5Link.hxx"
 #include "H5ListObject.hxx"
 
-#include "os_strdup.h"
+#include "os_string.h"
 
 namespace org_modules_hdf5
 {
index d2585f4..de7a075 100644 (file)
@@ -19,7 +19,7 @@
 #include "sci_malloc.h"
 #include "BOOL.h"
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "freeArrayOfString.h"
 /*------------------------------------------------------------------------*/
 #define STRING_BEGIN_SESSION _("Begin Session : ")
index a1b016c..956163a 100644 (file)
@@ -26,7 +26,7 @@ extern "C"
 #include "InitializeHistoryManager.h"
 #include "TerminateHistoryManager.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "CommandHistory_Wrap.h"
 #include "localization.h"
 #include "getCommentDateSession.h"
index ecb3ef5..f5f7821 100644 (file)
@@ -16,7 +16,7 @@ extern "C"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "os_strdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 }
 #include "HistorySearch.hxx"
index ff9764a..c330000 100644 (file)
@@ -22,7 +22,7 @@
 
 extern "C"
 {
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "localization.h"
 #include "Scierror.h"
 #include "sci_malloc.h"
index d4d3104..3802521 100644 (file)
@@ -43,7 +43,7 @@ extern "C"
 #include "findfiles.h"
 #include "FileExist.h"
 #include "deleteafile.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 #include "splitpath.h"
 #include "os_wfopen.h"
 #include "sciprint.h"
index 5581170..47437b0 100644 (file)
@@ -16,8 +16,7 @@
 #ifdef _MSC_VER
 #include <Windows.h> /* GetEnvironmentVariable */
 #endif
-#include "os_strdup.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 #include "getenvc.h"
 #include "localization.h"
index fba88ff..e0968a2 100644 (file)
@@ -20,7 +20,7 @@
 #include "../../../core/src/c/dynamic_tclsci.h"
 #include "sci_malloc.h" /* MALLOC */
 #include "charEncoding.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 BOOL setenvc(const char *stringIn, const char *valueIn)
 {
index 66ff108..cf6e577 100644 (file)
@@ -18,8 +18,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "stricmp.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "expandPathVariable.h"
 #include "PATH_MAX.h"
 #include <libxml/xpath.h>
index 058e29e..6a46703 100644 (file)
@@ -29,7 +29,7 @@
 #include "scilabDefaults.h"
 #include "localization.h"
 #include "fromjava.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "catchIfJavaException.h"
 /*--------------------------------------------------------------------------*/
 static void DoLoadClasspathInEtc(char *sciPath);
index 3db4011..c6b15dc 100644 (file)
@@ -19,9 +19,8 @@
 #include "sci_malloc.h"
 #include "localization.h"
 #include "machine.h"
-#include "stricmp.h"
 #include "FileExist.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "strsubst.h"
 #include "getos.h"
 #include "getshortpathname.h"
index 15a25d7..fe1cb11 100644 (file)
@@ -24,8 +24,7 @@
 #include "sci_malloc.h"
 #include "localization.h"
 #include "configvariable_interface.h"
-#include "stricmp.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "getshortpathname.h"
 #include "BOOL.h"
 /*--------------------------------------------------------------------------*/
index 6bbbf3f..bf7ec2f 100644 (file)
@@ -21,8 +21,7 @@
 #include "sci_path.h"
 #include "sci_malloc.h"
 #include "localization.h"
-#include "stricmp.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "BOOL.h"
 #include "getshortpathname.h"
 /*--------------------------------------------------------------------------*/
index 141eb09..b4b6f4d 100644 (file)
 #include "getScilabJNIEnv.h"
 #include "localization.h"
 #include "sci_path.h"
-#include "stricmp.h"
 #include "addToClasspath.h"
 #include "loadOnUseClassPath.h"
 #include "loadClasspath.h"
 #include "FileExist.h"
 #include "GetXmlFileEncoding.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 BOOL loadOnUseClassPath(char const* tag)
 {
index 6e535d1..e75ff98 100644 (file)
@@ -16,7 +16,7 @@
 #include "system_getproperty.h"
 #include "getScilabJNIEnv.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 char * system_getproperty(const char * property, const char * defaultproperty)
 {
index 08bebee..b6ad552 100644 (file)
@@ -17,7 +17,7 @@
 #include "getScilabJNIEnv.h"
 #include "sci_malloc.h"
 #include "catchIfJavaException.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 char * system_setproperty(char *property, char *value)
 {
index 77b123f..897485a 100644 (file)
@@ -19,7 +19,7 @@
 #include "api_scilab.h"
 #include "Scierror.h"
 #include "strsubst.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "freeArrayOfString.h"
 
 /*--------------------------------------------------------------------------*/
index c925e6a..9cfa6c8 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
 #include "localization.h"
 #include "charEncoding.h"
 #include "setgetlanguage.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "configvariable_interface.h"
 #ifdef _MSC_VER
 #include "LanguagePreferences_Windows.h"
index 0a1b499..a3ce0c3 100644 (file)
@@ -35,7 +35,7 @@
 #include "scilabDefaults.h"
 #include "setgetlanguage.h"
 #include "isdir.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #ifdef _MSC_VER
 #include "LanguagePreferences_Windows.h"
 #endif
index 32c7050..d901fd7 100644 (file)
@@ -15,8 +15,7 @@
 #include <Windows.h>
 #include <wchar.h>
 #include "LanguagePreferences_Windows.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "charEncoding.h"
 #include "setgetlanguage.h"
 #include "version.h"
index 9f34b4f..41c32ad 100644 (file)
@@ -16,7 +16,7 @@
 #include <Windows.h>
 #include "LocaleNameToLCID_Windows.h"
 #endif
-#include "os_strdup.h"
+#include "os_string.h"
 #include "getLcidString.h"
 #include "sci_malloc.h"
 #include "charEncoding.h"
index 4d95fc8..480cad7 100644 (file)
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include "getLocaleInfo_Windows.h"
 #include "sci_malloc.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 char* getLocaleSystemInfo(void)
 {
index fd934e1..94d24de 100644 (file)
@@ -53,6 +53,7 @@
 #include "scilabDefaults.h"
 #include "charEncoding.h"
 #include "../../../io/includes/setenvc.h"
+#include "os_string.h"
 
 /*--------------------------------------------------------------------------*/
 //static wchar_t CURRENTLANGUAGESTRING[LengthAlphacode] = SCILABDEFAULTLANGUAGE;
@@ -405,7 +406,7 @@ BOOL exportLocaleToSystem(const wchar_t *locale)
         /* We need to set a external environment variable to scilab env. */
         char* pstr = NULL;
         wchar_t env[MAX_PATH];
-        swprintf(env, MAX_PATH, L"%ls=%ls", EXPORTENVLOCALESTR, locale);
+        os_swprintf(env, MAX_PATH, L"%ls=%ls", EXPORTENVLOCALESTR, locale);
         pstr = wide_string_to_UTF8(env);
         gettext_putenv(pstr);
         FREE(pstr);
index 4476a32..e044e65 100644 (file)
@@ -18,7 +18,7 @@
 #include "Scierror.h"
 #include "sci_malloc.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 int sci_matfile_listvar(char *fname, void* pvApiCtx)
 {
index 5a04849..1c18e9e 100644 (file)
@@ -15,7 +15,7 @@
 #include "api_scilab.h"
 #include "CreateMatlabVariable.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 #include "localization.h"
 #include "Scierror.h"
index 8eddc9d..f0fd82e 100644 (file)
@@ -11,7 +11,7 @@
  *
  */
 
-#include "os_strdup.h"
+#include "os_string.h"
 #include "CreateMatlabVariable.h"
 #include "freeArrayOfString.h"
 #include "api_scilab.h"
index 33a2409..147c5c5 100644 (file)
@@ -73,7 +73,7 @@ extern "C"
 #include "machine.h"
 #include "mex.h"
 #include "freeArrayOfString.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 #ifdef getType
@@ -1514,7 +1514,7 @@ int mexEvalString(const char *name)
     }
     ast::exps_t LExp = pExp->getAs<SeqExp>()->getExps();
 
-    for (ast::exps_t::iterator j = LExp.begin(), itEnd = LExp.end() ;j != itEnd ; ++j)
+    for (ast::exps_t::iterator j = LExp.begin(), itEnd = LExp.end() ; j != itEnd ; ++j)
     {
         try
         {
index 3b06701..475ee6d 100644 (file)
@@ -27,9 +27,9 @@ extern "C"
 #include "sci_malloc.h"
 #include "localization.h"
 #include "charEncoding.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "os_wtoi.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 #define NanString L"Nan"
index c057138..6bb4f5d 100644 (file)
@@ -22,7 +22,7 @@
 #include "sciprint.h"
 #include "api_scilab.h"
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static int commonFindLabel(void* _pvCtx, int * _piAddress, char const * const _pstLabelToFind);
 static int commonFindLabelPartial(void* _pvCtx, int * _piAddress, char const * const _pstLabelToFind);
@@ -928,7 +928,7 @@ SciErr createPList(void* _pvCtx, int _iVar, int ** _piAddress, char ** _pstLabel
         label_list[i] = os_strdup(_pstLabelNames[i - 1]);
     }
 
-    _SciErr = createMatrixOfStringInList(_pvCtx, _iVar, *_piAddress, 1, 1, _iNbParams + 1, (char const* const*) label_list);
+    _SciErr = createMatrixOfStringInList(_pvCtx, _iVar, *_piAddress, 1, 1, _iNbParams + 1, (char const * const*) label_list);
 
     if (label_list)
     {
@@ -996,7 +996,7 @@ SciErr createStringInPList(void* _pvCtx, int _iVar, int * _piAddress, char * _ps
 #endif
 
     tmp_val[0] = os_strdup(_pstValue);
-    _SciErr = createMatrixOfStringInList(_pvCtx, _iVar, _piAddress, itemPos, 1, 1, (char const* const*) tmp_val);
+    _SciErr = createMatrixOfStringInList(_pvCtx, _iVar, _piAddress, itemPos, 1, 1, (char const * const*) tmp_val);
 
     if (tmp_val[0])
     {
index d34c01d..2717a94 100644 (file)
@@ -18,8 +18,7 @@
 #include "GetXmlFileEncoding.h"
 #include "sci_malloc.h"
 #include "FileExist.h"
-#include "stricmp.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "getshortpathname.h"
 #include "BOOL.h"
 #include "sci_home.h"
index 4b79ad0..0595608 100644 (file)
@@ -18,7 +18,7 @@ extern "C" {
 #include "getScilabJavaVM.h"
 #include "RendererFontManager.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 }
 
 using namespace org_scilab_modules_renderer_utils_textRendering;
index 387c12a..91e899b 100644 (file)
@@ -45,7 +45,7 @@
 
 #include "sci_malloc.h"
 
-#include "os_strdup.h"
+#include "os_string.h"
 
 #ifdef _MSC_VER
 #define snprintf _snprintf
index f744acc..ed66ec1 100644 (file)
@@ -34,7 +34,7 @@
 extern "C" {
 #endif
 
-#include "os_strdup.h"
+#include "os_string.h"
 
 #define EZXML_BUFSIZE 1024 // size of internal memory buffers
 #define EZXML_NAMEM   0x80 // name is malloced
index ed03dec..ec22249 100644 (file)
@@ -33,7 +33,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index a7b1122..4dbe79e 100644 (file)
@@ -29,7 +29,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index b3de834..59dde31 100644 (file)
@@ -29,7 +29,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index ba8232a..bee4e1d 100644 (file)
@@ -31,7 +31,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index 723dd8b..311bcca 100644 (file)
@@ -30,7 +30,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index 805941a..3bd4368 100644 (file)
@@ -32,7 +32,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index d961d97..12f1978 100644 (file)
@@ -33,7 +33,7 @@
 #include "math.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index e78bdc1..9c0a691 100644 (file)
@@ -31,7 +31,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index 50859f1..73f679a 100644 (file)
@@ -31,7 +31,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index d64338e..f8f91e6 100644 (file)
@@ -29,7 +29,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index fdb14d6..1fdc94c 100644 (file)
@@ -29,7 +29,7 @@
 #include "scicos.h"
 
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 #include "FigureList.h"
 #include "BuildObjects.h"
index 31be91f..5288922 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
 #include "scicos_block4.h"
 #include "scicos.h"
 #include "core_math.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
     double C2F(sciround) (double *x);
     SCICOS_BLOCKS_IMPEXP void affich2(scicos_block * block, int flag);
index f637318..bfb6ce6 100644 (file)
@@ -20,7 +20,7 @@
 #include "BOOL.h"
 #include "ScilabKeywords.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 
 /*
index 662298c..b419ac2 100644 (file)
@@ -17,7 +17,7 @@
 #include <windows.h>
 #endif
 #include "gw_sound.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 #include "Scierror.h"
 #include "localization.h"
@@ -138,7 +138,7 @@ int sci_beep(char *fname, void* pvApiCtx)
         output = os_strdup(BEEP_OFF);
     }
 
-    sciErr = createMatrixOfString(pvApiCtx, nbInputArgument(pvApiCtx) + 1, m_out, n_out, (const char* const*) &output);
+    sciErr = createMatrixOfString(pvApiCtx, nbInputArgument(pvApiCtx) + 1, m_out, n_out, (const char * const*) &output);
     if (sciErr.iErr)
     {
         printError(&sciErr, 0);
index e3782a2..e798a02 100644 (file)
@@ -20,7 +20,7 @@
 #include "sci_malloc.h"
 #include "localization.h"
 #include "gw_csv_helpers.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "freeArrayOfString.h"
 
 // =============================================================================
index a2cd57d..6331364 100644 (file)
@@ -22,7 +22,7 @@
 #include "Scierror.h"
 #include "localization.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "csvDefault.h"
 #include "gw_csv_helpers.h"
 #include "csvDefault.h"
index 7f6ca43..e85d833 100644 (file)
@@ -27,7 +27,7 @@
 #include "complex_array.h"
 #include "gw_csv_helpers.h"
 #include "getRange.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 static void freeVar(char** filename, char** separator, char** decimal, char** conversion, int** iRange, char*** toreplace, int sizeReplace, char** regexp);
 /* ==================================================================== */
index ffd8a4a..3c21a59 100644 (file)
@@ -25,7 +25,7 @@
 #include "csvRead.h"
 #include "getRange.h"
 #include "gw_csv_helpers.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 static void freeVar(char*** text, int sizeText, int** lengthText, char** separator, char** decimal, char** conversion, int** iRange);
 // =============================================================================
index 6825817..076fa14 100644 (file)
@@ -25,7 +25,7 @@
 #include "csvDefault.h"
 #include "checkCsvWriteFormat.h"
 #include "gw_csv_helpers.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 
 static void freeVar(char** separator, char** decimal, char** filename, char** precisionFormat, char*** pHeadersLines, int sizeHeader);
index ca46100..1ae0d73 100644 (file)
@@ -13,7 +13,7 @@
 #include <ctype.h>
 #include "csvDefault.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "checkCsvWriteFormat.h"
 // =============================================================================
 #define NB_FORMAT_SUPPORTED 7
index 8429e79..a0c5f3d 100644 (file)
@@ -12,7 +12,7 @@
 #include <string.h>
 #include "csvDefault.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "checkCsvWriteFormat.h"
 // =============================================================================
 #define DEFAULT_CSV_SEPARATOR ","
index d37480a..a4ad89a 100644 (file)
@@ -24,7 +24,7 @@
 #include "pcre_private.h"
 #include "sciprint.h"
 #include "splitLine.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "csvDefault.h"
 #include "strsubst.h"
 // =============================================================================
index 98c6dd6..9d46479 100644 (file)
@@ -12,7 +12,7 @@
 #include <string.h>
 #include "sci_malloc.h"
 #include "getRange.h"
-#include "os_strdup.h"
+#include "os_string.h"
 // =============================================================================
 #define SIZE_ARRAY_RANGE 4
 // =============================================================================
index 727fafd..94d8b89 100644 (file)
@@ -11,7 +11,7 @@
 #include "localization.h"
 #include "sci_malloc.h"
 #include "charEncoding.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 
 #define DUW if (oleuw->debug)
index 1e506b5..7ba1467 100644 (file)
@@ -11,7 +11,7 @@
 #include "sci_malloc.h"
 #include "localization.h"
 
-#include "os_strdup.h"
+#include "os_string.h"
 
 #ifdef _MSC_VER
 #define vsnprintf _vsnprintf
index d089241..054377e 100644 (file)
@@ -12,7 +12,7 @@
 #include <string.h>
 #include "utftolatin.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 // =============================================================================
 char *utftolatin(char *utfString)
 {
index 7e85251..a938056 100644 (file)
@@ -157,15 +157,10 @@ includes/dynlib_string_gw.h \
 includes/dynlib_string.h \
 includes/getfastcode.h \
 includes/men_Sutils.h \
-includes/os_strdup.h \
-includes/os_stricmp.h \
-includes/os_swprintf.h \
-includes/os_wcsdup.h \
-includes/os_wcsicmp.h \
+includes/os_string.h \
 includes/os_wcstok.h \
 includes/pcre_private.h \
 includes/scistrtostr.h \
-includes/stricmp.h \
 includes/StringConvert.h \
 includes/string_gw.hxx \
 includes/stringToComplex.h \
index 33201df..1b4450d 100644 (file)
@@ -757,15 +757,10 @@ includes/dynlib_string_gw.h \
 includes/dynlib_string.h \
 includes/getfastcode.h \
 includes/men_Sutils.h \
-includes/os_strdup.h \
-includes/os_stricmp.h \
-includes/os_swprintf.h \
-includes/os_wcsdup.h \
-includes/os_wcsicmp.h \
+includes/os_string.h \
 includes/os_wcstok.h \
 includes/pcre_private.h \
 includes/scistrtostr.h \
-includes/stricmp.h \
 includes/StringConvert.h \
 includes/string_gw.hxx \
 includes/stringToComplex.h \
diff --git a/scilab/modules/string/includes/os_strdup.h b/scilab/modules/string/includes/os_strdup.h
deleted file mode 100644 (file)
index 8e16238..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2010-2010 - DIGITEO - Bruno JOFRET
- *
- *  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
- *
- */
-
-#ifndef __OS_STRDUP_H__
-#define __OS_STRDUP_H__
-
-#include <string.h>
-
-// Windows
-#ifdef _MSC_VER
-#define os_strdup       _strdup
-#endif
-
-// Linux
-#ifdef __linux__
-#define os_strdup       strdup
-#endif
-
-// MacOS X
-#ifdef __APPLE__
-#define os_strdup       strdup
-#endif
-
-#endif /* !__OS_STRDUP_H__ */
diff --git a/scilab/modules/string/includes/os_stricmp.h b/scilab/modules/string/includes/os_stricmp.h
deleted file mode 100644 (file)
index bb86c78..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 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
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-/*-----------------------------------------------------------------------*/
-#ifndef __STRICMP_H__
-#define __STRICMP_H__
-
-#include <string.h>
-
-/* compare two strings ignoring the case */
-
-#ifdef _MSC_VER
-#define stricmp _stricmp
-#define strnicmp _strnicmp
-#define wcsicmp _wcsicmp
-#define wcsnicmp _wcsnicmp
-#else
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
-#define wcsicmp wcscasecmp
-#define wcsnicmp wcsncasecmp
-#endif
-
-#endif /* __STRICMP_H__ */
-/*-----------------------------------------------------------------------*/
diff --git a/scilab/modules/string/includes/os_string.h b/scilab/modules/string/includes/os_string.h
new file mode 100644 (file)
index 0000000..c2d11ad
--- /dev/null
@@ -0,0 +1,103 @@
+/*
+*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+*  Copyright (C) 2010 - DIGITEO - Antoine ELIAS
+*
+*  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
+*
+*/
+
+#ifndef __OS_STRING_H__
+#define __OS_STRING_H__
+#include <wchar.h>
+#include <string.h>
+// Windows
+#ifdef _MSC_VER
+#define os_wcsdup       _wcsdup
+#define os_strdup       _strdup
+#define os_swprintf     swprintf_s
+#define os_sprintf      sprintf_s
+#define os_wcsicmp      _wcsicmp
+#define stricmp         _stricmp
+#define strnicmp        _strnicmp
+#define wcsicmp         _wcsicmp
+#define wcsnicmp        _wcsnicmp
+#define os_strcpy       strcpy_s
+#define os_splitpath    _splitpath_s
+#define os_wsplitpath   _wsplitpath_s
+#define os_makepath     _makepath_s
+#endif
+
+// Linux
+#ifdef __linux__
+#define os_wcsdup       wcsdup
+#define os_strdup       strdup
+#define os_swprintf     swprintf
+#define os_sprintf      sprintf
+#define os_wcsicmp      wcscasecmp
+#define stricmp         strcasecmp
+#define strnicmp        strncasecmp
+#define wcsicmp         wcscasecmp
+#define wcsnicmp        wcsncasecmp
+#define os_strcpy       strcpy
+#define os_splitpath    _splitpath
+#define os_wsplitpath   _wsplitpath
+#define os_makepath     _makepath
+#endif
+
+// MacOS X
+#ifdef __APPLE__
+wchar_t *macOSwcsdup(const wchar_t *_pwcsSource);
+#define os_wcsdup       macOSwcsdup
+#define os_strdup       strdup
+#define os_swprintf     swprintf
+#define os_sprintf      sprintf
+
+#include <stdlib.h>
+#include <wchar.h>
+#include <wctype.h>
+
+inline int macOSwcscasecmp(const wchar_t *_pwcsS1, const wchar_t *_pwcsS2)
+{
+    int iResult = 0;
+    int i = 0;
+
+    wchar_t *pwcsLowerS1 = (wchar_t *)malloc(sizeof(wchar_t) * wcslen(_pwcsS1) + 1);
+    wchar_t *pwcsLowerS2 = (wchar_t *)malloc(sizeof(wchar_t) * wcslen(_pwcsS2) + 1);;
+
+    wcscpy(pwcsLowerS1, _pwcsS1);
+    wcscpy(pwcsLowerS2, _pwcsS2);
+
+    // Lower S1
+    for (i = 0; i < wcslen(_pwcsS1); ++i)
+    {
+        pwcsLowerS1[i] = towlower(_pwcsS1[i]);
+    }
+
+    // Lower S2
+    for (i = 0; i < wcslen(_pwcsS2); ++i)
+    {
+        pwcsLowerS2[i] = towlower(_pwcsS2[i]);
+    }
+
+    iResult = wcscmp(pwcsLowerS1, pwcsLowerS2);
+    free(pwcsLowerS1);
+    free(pwcsLowerS2);
+    return iResult;
+}
+
+#define os_wcsicmp      macOSwcscasecmp
+#define stricmp         strcasecmp
+#define strnicmp        strncasecmp
+#define wcsicmp         wcscasecmp
+#define wcsnicmp        wcsncasecmp
+#define os_strcpy       strcpy
+#define os_splitpath    _splitpath
+#define os_wsplitpath   _wsplitpath
+#define os_makepath     _makepath
+#endif
+
+#endif /* !__OS_STRING_H__ */
\ No newline at end of file
diff --git a/scilab/modules/string/includes/os_swprintf.h b/scilab/modules/string/includes/os_swprintf.h
deleted file mode 100644 (file)
index 6a8935a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2010 - DIGITEO - Antoine ELIAS
- *
- *  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
- *
- */
-
-#ifndef __OS_SWPRINTF_H__
-#define __OS_SWPRINTF_H__
-
-#include <string.h>
-
-// Windows
-#ifdef _MSC_VER
-#define os_swprintf       swprintf_s
-#endif
-
-// Linux
-#ifdef __linux__
-#define os_swprintf       swprintf
-#endif
-
-// MacOS X
-#ifdef __APPLE__
-#define os_swprintf       swprintf
-#endif
-
-#endif /* !__OS_SWPRINTF_H__ */
diff --git a/scilab/modules/string/includes/os_wcsdup.h b/scilab/modules/string/includes/os_wcsdup.h
deleted file mode 100644 (file)
index dda91ff..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2010-2010 - DIGITEO - Bruno JOFRET
- *
- *  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
- *
- */
-
-#ifndef __OS_WCSDUP_H__
-#define __OS_WCSDUP_H__
-
-#include <wchar.h>
-
-// Windows
-#ifdef _MSC_VER
-#define os_wcsdup       _wcsdup
-#endif
-
-// Linux
-#ifdef __linux__
-#define os_wcsdup       wcsdup
-#endif
-
-// MacOS X
-#ifdef __APPLE__
-wchar_t *macOSwcsdup(const wchar_t *_pwcsSource);
-#define os_wcsdup       macOSwcsdup
-#endif
-
-#endif /* !__OS_WCSDUP_H__ */
diff --git a/scilab/modules/string/includes/os_wcsicmp.h b/scilab/modules/string/includes/os_wcsicmp.h
deleted file mode 100644 (file)
index 482d6d5..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2010 - DIGITEO - Bruno JOFRET
- *
- * 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
- *
- */
-
-#ifndef __OS_WCSICMP_H__
-#define __OS_WCSICMP_H__
-
-#ifdef _MSC_VER
-#include <wchar.h>
-#define os_wcsicmp _wcsicmp
-#endif
-
-#ifdef __linux__
-#include <wchar.h>
-#define os_wcsicmp wcscasecmp
-#endif
-
-#ifdef __APPLE__
-#include <wchar.h>
-#include <wctype.h>
-
-inline int macOSwcscasecmp(const wchar_t *_pwcsS1, const wchar_t *_pwcsS2)
-{
-    int iResult = 0;
-    int i = 0;
-
-    wchar_t *pwcsLowerS1 = (wchar_t *) malloc(sizeof(wchar_t) * wcslen(_pwcsS1) + 1);
-    wchar_t *pwcsLowerS2 = (wchar_t *) malloc(sizeof(wchar_t) * wcslen(_pwcsS2) + 1);;
-
-    wcscpy(pwcsLowerS1, _pwcsS1);
-    wcscpy(pwcsLowerS2, _pwcsS2);
-
-    // Lower S1
-    for (i = 0 ; i < wcslen(_pwcsS1) ; ++i)
-    {
-        pwcsLowerS1[i] = towlower(_pwcsS1[i]);
-    }
-
-    // Lower S2
-    for (i = 0 ; i < wcslen(_pwcsS2) ; ++i)
-    {
-        pwcsLowerS2[i] = towlower(_pwcsS2[i]);
-    }
-
-    iResult = wcscmp(pwcsLowerS1, pwcsLowerS2);
-    free(pwcsLowerS1);
-    free(pwcsLowerS2);
-    return iResult;
-}
-
-#define os_wcsicmp macOSwcscasecmp
-#endif
-
-#endif /* !__OS_WCSICMP_H__ */
diff --git a/scilab/modules/string/includes/stricmp.h b/scilab/modules/string/includes/stricmp.h
deleted file mode 100644 (file)
index 0588cc9..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 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
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*-----------------------------------------------------------------------*/
-#ifndef __STRICMP_H__
-#define __STRICMP_H__
-
-#include <string.h>
-
-/* compare two strings ignoring the case */
-
-#ifdef _MSC_VER
-#define stricmp _stricmp
-#define strnicmp _strnicmp
-#define wcsicmp _wcsicmp
-#define wcsnicmp _wcsnicmp
-#else
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
-#define wcsicmp wcscasecmp
-#define wcsnicmp wcsncasecmp
-#endif
-
-#endif /* __STRICMP_H__ */
-/*-----------------------------------------------------------------------*/
index ff9340b..85c3445 100644 (file)
@@ -21,7 +21,7 @@ using regular express .                                         */
 
 extern "C"
 {
-#include "os_strdup.h"
+#include "os_string.h"
 #include "Scierror.h"
 #include "localization.h"
 #include "pcre.h"
index 4042b6d..4a7a02d 100644 (file)
@@ -29,7 +29,7 @@ extern "C"
 #include "pcre_error.h"
 #include "Scierror.h"
 #include "charEncoding.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "freeArrayOfString.h"
 }
 /*------------------------------------------------------------------------*/
index fc8d106..9c7f0e8 100644 (file)
@@ -20,7 +20,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "core_math.h"
 #include "localization.h"
 #include "Scierror.h"
index 1c2959c..b993a8c 100644 (file)
@@ -29,7 +29,7 @@
 
 extern "C"
 {
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "Scierror.h"
 #include "localization.h"
 #include "sciprint.h"
index 9068fd9..6afb3ee 100644 (file)
@@ -20,7 +20,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "core_math.h"
 #include "localization.h"
 #include "Scierror.h"
index e8d56c9..8a98850 100644 (file)
@@ -20,7 +20,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "core_math.h"
 #include "localization.h"
 #include "Scierror.h"
index aaecc8e..32b21ed 100644 (file)
@@ -23,7 +23,7 @@ extern "C"
 #include "core_math.h"
 #include "localization.h"
 #include "Scierror.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "locale.h"
 }
 
index 8550205..20fb3dd 100644 (file)
@@ -22,7 +22,7 @@ extern "C"
 #include "core_math.h"
 #include "localization.h"
 #include "Scierror.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include <stdio.h>
 }
 
index a676a03..a213ba1 100644 (file)
@@ -21,7 +21,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "tokens.h"
 #include "core_math.h"
 #include "localization.h"
index ef6d5e5..4286b40 100644 (file)
@@ -10,8 +10,7 @@
  *
  */
 
-#include "string.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 
 #ifdef __APPLE__
 wchar_t *macOSwcsdup(const wchar_t *_pwcsSource)
index ae8e9ca..663547a 100644 (file)
@@ -23,7 +23,7 @@
 #include "sci_malloc.h"
 #include "BOOL.h"
 #include "pcre_private.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "strsubst.h"
 #include "configvariable_interface.h"
 #include "sciprint.h"
index e2d96c3..83fd805 100644 (file)
@@ -319,16 +319,11 @@ lib /DEF:"$(ProjectDir)localization_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pl
     <ClInclude Include="..\..\includes\dynlib_string_gw.h" />
     <ClInclude Include="..\..\includes\getfastcode.h" />
     <ClInclude Include="..\..\includes\men_Sutils.h" />
-    <ClInclude Include="..\..\includes\os_strdup.h" />
-    <ClInclude Include="..\..\includes\os_stricmp.h" />
-    <ClInclude Include="..\..\includes\os_swprintf.h" />
-    <ClInclude Include="..\..\includes\os_wcsdup.h" />
-    <ClInclude Include="..\..\includes\os_wcsicmp.h" />
+    <ClInclude Include="..\..\includes\os_string.h" />
     <ClInclude Include="..\..\includes\os_wcstok.h" />
     <ClInclude Include="..\..\includes\os_wtoi.h" />
     <ClInclude Include="..\..\includes\pcre_private.h" />
     <ClInclude Include="..\..\includes\scistrtostr.h" />
-    <ClInclude Include="..\..\includes\stricmp.h" />
     <ClInclude Include="..\..\includes\StringConvert.h" />
     <ClInclude Include="..\..\includes\stringToDouble.h" />
     <ClInclude Include="..\..\includes\string_gw.hxx" />
index 3623b21..6019d15 100644 (file)
     <ClInclude Include="..\..\includes\men_Sutils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\os_strdup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\includes\os_stricmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\includes\os_swprintf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\includes\os_wcsdup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\includes\os_wcsicmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\includes\os_wcstok.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\includes\pcre_private.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\includes\scistrtostr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\stricmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\includes\string_gw.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\cpp\sort_inter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\includes\os_string.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\os_wcstok.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\includes\os_wtoi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
index 7f816a2..962bbbb 100644 (file)
@@ -18,9 +18,7 @@
 #include "stringToComplex.h"
 #include "stringToDouble.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
-#include "stricmp.h"
+#include "os_string.h"
 #include "BOOL.h"
 #include "strsubst.h"
 /* ========================================================================== */
index 0b572ba..43329e4 100644 (file)
@@ -21,9 +21,7 @@
 #include "stringToDouble.h"
 #include "core_math.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
-#include "stricmp.h"
+#include "os_string.h"
 #ifndef _MSC_VER
 #ifndef stricmp
 #define stricmp strcasecmp
index 2fd8f18..de4e01e 100644 (file)
@@ -15,7 +15,7 @@
 #include <string.h>
 #include "stringsCompare.h"
 #include "sci_malloc.h"
-#include "stricmp.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static int sign(int x)
 {
index 1f19234..e901825 100644 (file)
@@ -18,7 +18,7 @@
 #include "stringsstrrev.h"
 #include "freeArrayOfString.h"
 #include "sci_malloc.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 /*----------------------------------------------------------------------------*/
 wchar_t **strings_strrev(wchar_t **Input_strings, int Dim_Input_strings)
 {
index 3c2e797..f12c347 100644 (file)
@@ -14,7 +14,7 @@
 #include <ctype.h>
 #include <string.h>
 #include "stristr.h"
-#include "stricmp.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 char *stristr(const char *psz, const char *tofind)
 {
index 7136584..16c4210 100644 (file)
@@ -19,8 +19,7 @@
 #include "strsubst.h"
 #include "sci_malloc.h"
 #include "pcre_private.h"
-#include "os_strdup.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "charEncoding.h"
 /*--------------------------------------------------------------------------*/
 char **strsubst(const char **strings_input, int strings_dim, const char *string_to_search, const char *replacement_string)
@@ -373,7 +372,7 @@ wchar_t *wcssub(const wchar_t* _pwstInput, const wchar_t* _pwstSearch, const wch
 
     pwstOutput = (wchar_t*)MALLOC(sizeof(wchar_t) * (wcslen(_pwstInput) + iOffset + 1));
     memset(pwstOutput, 0x00, sizeof(wchar_t) * (wcslen(_pwstInput) + iOffset + 1));
-    
+
     if (iOccurs == 0)
     {
         wcscpy(pwstOutput, _pwstInput);
index b1e167f..8991e68 100644 (file)
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include "sci_malloc.h"
 #include "tokens.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 #include "os_wcstok.h"
 
 
index c0d38e9..3844a00 100644 (file)
@@ -16,7 +16,7 @@
 extern "C"
 {
 #include "sci_malloc.h"
-#include "os_wcsdup.h"
+#include "os_string.h"
 }
 
 /*--------------------------------------------------------------------------*/
index 3d70468..743ce98 100644 (file)
@@ -20,7 +20,7 @@
 #include "localization.h"
 #include "freeArrayOfString.h"
 #include "GlobalTclInterp.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 int sci_TCL_EvalStr(char *fname, unsigned long l)
 {
index a62581e..ec1ce8f 100644 (file)
@@ -22,7 +22,7 @@
 #include "TCL_ArrayGetVar.h"
 #include "sci_malloc.h"
 #include "GlobalTclInterp.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "freeArrayOfString.h"
 /*--------------------------------------------------------------------------*/
 int sci_TCL_GetVar(char *fname, unsigned long l)
index a50497c..bd610a4 100644 (file)
@@ -14,7 +14,7 @@
 #include "gw_tclsci.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 int sci_TCL_GetVersion(char *fname, unsigned long l)
 {
index 2d877dc..9c6509b 100644 (file)
@@ -20,7 +20,7 @@
 #include <windows.h>
 #include "EnvTclTk.h"
 #endif
-#include "os_strdup.h"
+#include "os_string.h"
 #include "InitTclTk.h"
 #include "sci_path.h"
 #include "sciprint.h"
index fbddd82..44c3cbe 100644 (file)
@@ -20,7 +20,7 @@
 #include "localization.h"
 #include "syncexec.h"
 #include "storeCommand.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 /* what's the max number of commands in the queue ??*/
 #define arbitrary_max_queued_callbacks 20
index f146a21..9c77282 100644 (file)
@@ -20,7 +20,7 @@
 #include "TCL_ArrayDim.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #define TCL_ALL_INDEXES "TclScilabTmpVar1"
 #define TCL_NUMERICAL_INDEXES "TclScilabTmpVar2"
index d7ff5f9..9a33730 100644 (file)
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include "TCL_ArrayGetVar.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #define TCL_NOT_DEFINE "#NOT DEF.#"
 /*--------------------------------------------------------------------------*/
index 8984631..4462d18 100644 (file)
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #endif
 
-#include "os_strdup.h"
+#include "os_string.h"
 #include "sci_malloc.h"
 #include "TCL_Command.h"
 #include "GlobalTclInterp.h"
index 1495d54..2119edf 100644 (file)
@@ -21,7 +21,7 @@ extern "C"
 {
 #include "Scierror.h"
 #include "localization.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 using namespace types;
index 888ee15..b910de7 100644 (file)
@@ -21,7 +21,7 @@ extern "C"
 {
 #include "Scierror.h"
 #include "localization.h"
-#include "os_swprintf.h"
+#include "os_string.h"
 }
 
 using namespace types;
index f1310cc..a0e53d3 100644 (file)
@@ -15,7 +15,7 @@
 #include "ui_data.h"
 #include "api_scilab.h"
 #include "Scierror.h"
-#include "os_strdup.h"
+#include "os_string.h"
 
 
 void putScilabVariable(const char* name, const char* const* lines, int rows, int cols)
index 99feafb..d1ebecf 100644 (file)
@@ -33,7 +33,7 @@ extern "C"
 #include "getScilabJavaVM.h"
 #include "Scierror.h"
 #include "freeArrayOfString.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "sci_types.h"
 }
 using namespace org_scilab_modules_ui_data;
index 5aa191c..2e5d245 100644 (file)
@@ -17,7 +17,7 @@
 #include "stack-c.h"
 #include "localization.h"
 #include "Scierror.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #pragma comment(lib, "winmm.lib")
 /*--------------------------------------------------------------------------*/
index bb12924..79804ba 100644 (file)
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include "FindFileAssociation.h"
 #include "sci_malloc.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "PATH_MAX.h"
 #include "charEncoding.h"
 /*--------------------------------------------------------------------------*/
index 7b94773..817e82a 100644 (file)
@@ -13,7 +13,7 @@
 /*--------------------------------------------------------------------------*/
 #include <unknwn.h>
 #include "createGUID.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #define _OLEAUT32_
 /*--------------------------------------------------------------------------*/
index 27f0df7..38e9282 100644 (file)
@@ -16,7 +16,7 @@
 #include "PATH_MAX.h"
 #include "sci_malloc.h"
 #include "GetWindowsVersion.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #define MAX_KEY_LENGTH 255
 #define MAX_VALUE_NAME 16383
index bbe675d..8caa862 100644 (file)
@@ -25,7 +25,7 @@
 #include "sci_malloc.h"
 #include "FindScilab.h"
 #include "wmcopydata.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "MutexClosingScilab.h"
 #include "with_module.h"
 #include "FileExist.h"
index f723d75..0bf05aa 100644 (file)
@@ -16,7 +16,7 @@
 #include "version.h"
 #include "sci_malloc.h"
 #include "WndThread.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 #define LineMax 255
 #define NumberScilabMax 10
index 6164e01..551e9f6 100644 (file)
@@ -14,7 +14,7 @@
 #include "TextToPrint.h"
 #include "sci_malloc.h"
 #include "charEncoding.h"
-#include "os_strdup.h"
+#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 static HDC PrinterHDC = NULL;
 static char PrinterName[2048];
@@ -332,7 +332,7 @@ void PrintFile(char *filename)
                     }
                     else
                     {
-                        LignePrint = strdup(line);
+                        LignePrint = os_strdup(line);
                         TextOut (PrintDC, (tm.tmMaxCharWidth + 10), Index2 * HauteurCaractere, LignePrint, (int)strlen(LignePrint));
                         if (LignePrint)
                         {
index 92e1478..797e1c6 100644 (file)
@@ -19,7 +19,7 @@
 #include "version.h"
 #include "wmcopydata.h"
 #include "storeCommand.h"
-#include "os_strdup.h"
+#include "os_string.h"
 #include "charEncoding.h"