Added removedir meof mgetstr mputstr. 90/3690/5
cedric Delamarre [Wed, 30 Mar 2011 16:02:37 +0000 (18:02 +0200)]
Change-Id: Ie7aa7dc8bee53e5789a9bd8bc89551a6a0ed5090

23 files changed:
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/includes/fileio_gw.hxx
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_mgetstr.c [deleted file]
scilab/modules/fileio/sci_gateway/c/sci_moef.c [deleted file]
scilab/modules/fileio/sci_gateway/c/sci_mputstr.c [deleted file]
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.cpp
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcproj
scilab/modules/fileio/sci_gateway/cpp/sci_meof.cpp [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/cpp/sci_mgetstr.cpp [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/cpp/sci_mputstr.cpp [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/cpp/sci_removedir.cpp [new file with mode: 0644]
scilab/modules/fileio/src/c/meof.c [deleted file]
scilab/modules/fileio/src/c/meof.h [deleted file]
scilab/modules/fileio/src/c/mgetstr.c [deleted file]
scilab/modules/fileio/src/c/mgetstr.h [deleted file]
scilab/modules/fileio/src/c/mputstr.c [deleted file]
scilab/modules/fileio/src/c/mputstr.h [deleted file]
scilab/modules/fileio/src/cpp/mgetstr.cpp [new file with mode: 0644]
scilab/modules/fileio/src/cpp/mgetstr.h [new file with mode: 0644]

index c8b2813..f559c20 100644 (file)
@@ -16,12 +16,9 @@ src/c/getfiledesc.c \
 src/c/getfileinfo.c \
 src/c/getfiletype.c \
 src/c/mclearerr.c \
-src/c/meof.c \
 src/c/merror.c \
 src/c/mgeti.c \
-src/c/mgetstr.c \
 src/c/mputi.c \
-src/c/mputstr.c \
 src/c/mseek.c \
 src/c/mtell.c \
 src/c/readline.c \
@@ -62,14 +59,10 @@ sci_gateway/c/sci_fscanfMat.c \
 sci_gateway/c/sci_maxfiles.c \
 sci_gateway/c/sci_getdrives.c \
 sci_gateway/c/sci_pathsep.c \
-sci_gateway/c/sci_removedir.c \
 sci_gateway/c/sci_chdir.c \
 sci_gateway/c/sci_pwd.c \
 sci_gateway/c/sci_mclearerr.c \
 sci_gateway/c/sci_merror.c \
-sci_gateway/c/sci_mgetstr.c \
-sci_gateway/c/sci_moef.c \
-sci_gateway/c/sci_mputstr.c \
 sci_gateway/c/sci_mseek.c \
 sci_gateway/c/sci_mtell.c \
 sci_gateway/c/sci_newest.c \
@@ -99,9 +92,12 @@ GATEWAY_CPP_SOURCES = \
        sci_gateway/cpp/sci_getlongpathname.cpp \
        sci_gateway/cpp/sci_fileext.cpp \
        sci_gateway/cpp/sci_createdir.cpp \
-       sci_gateway/cpp/sci_fullpath.cpp
-
-
+       sci_gateway/cpp/sci_fullpath.cpp \
+       sci_gateway/cpp/sci_removedir.cpp \
+       sci_gateway/cpp/sci_meof.cpp \
+       sci_gateway/cpp/sci_mputstr.cpp \
+       sci_gateway/cpp/sci_mgetstr.cpp
+               
 FILEIO_CPP_SOURCES = \
        src/cpp/expandPathVariable.cpp \
        src/cpp/mopen.cpp \
@@ -110,6 +106,7 @@ FILEIO_CPP_SOURCES = \
        src/cpp/mget.cpp \
        src/cpp/mputl.cpp \
        src/cpp/mgetl.cpp \
+       src/cpp/mgetstr.cpp \
        src/cpp/filemanager.cpp
 
 
index 1341cae..33e64d1 100644 (file)
@@ -122,10 +122,9 @@ am__objects_1 = libscifileio_algo_la-FileExist.lo \
        libscifileio_algo_la-getfiledesc.lo \
        libscifileio_algo_la-getfileinfo.lo \
        libscifileio_algo_la-getfiletype.lo \
-       libscifileio_algo_la-mclearerr.lo libscifileio_algo_la-meof.lo \
+       libscifileio_algo_la-mclearerr.lo \
        libscifileio_algo_la-merror.lo libscifileio_algo_la-mgeti.lo \
-       libscifileio_algo_la-mgetstr.lo libscifileio_algo_la-mputi.lo \
-       libscifileio_algo_la-mputstr.lo libscifileio_algo_la-mseek.lo \
+       libscifileio_algo_la-mputi.lo libscifileio_algo_la-mseek.lo \
        libscifileio_algo_la-mtell.lo libscifileio_algo_la-readline.lo \
        libscifileio_algo_la-getdrives.lo \
        libscifileio_algo_la-deleteafile.lo \
@@ -154,6 +153,7 @@ am__objects_2 = libscifileio_algo_la-expandPathVariable.lo \
        libscifileio_algo_la-mopen.lo libscifileio_algo_la-mclose.lo \
        libscifileio_algo_la-mput.lo libscifileio_algo_la-mget.lo \
        libscifileio_algo_la-mputl.lo libscifileio_algo_la-mgetl.lo \
+       libscifileio_algo_la-mgetstr.lo \
        libscifileio_algo_la-filemanager.lo
 am_libscifileio_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscifileio_algo_la_OBJECTS = $(am_libscifileio_algo_la_OBJECTS)
@@ -170,13 +170,10 @@ am__objects_3 = libscifileio_la-gw_fileio.lo \
        libscifileio_la-sci_fscanfMat.lo \
        libscifileio_la-sci_maxfiles.lo \
        libscifileio_la-sci_getdrives.lo \
-       libscifileio_la-sci_pathsep.lo \
-       libscifileio_la-sci_removedir.lo libscifileio_la-sci_chdir.lo \
+       libscifileio_la-sci_pathsep.lo libscifileio_la-sci_chdir.lo \
        libscifileio_la-sci_pwd.lo libscifileio_la-sci_mclearerr.lo \
-       libscifileio_la-sci_merror.lo libscifileio_la-sci_mgetstr.lo \
-       libscifileio_la-sci_moef.lo libscifileio_la-sci_mputstr.lo \
-       libscifileio_la-sci_mseek.lo libscifileio_la-sci_mtell.lo \
-       libscifileio_la-sci_newest.lo \
+       libscifileio_la-sci_merror.lo libscifileio_la-sci_mseek.lo \
+       libscifileio_la-sci_mtell.lo libscifileio_la-sci_newest.lo \
        libscifileio_la-sci_get_absolute_file_path.lo \
        libscifileio_la-sci_getrelativefilename.lo \
        libscifileio_la-sci_copyfile.lo \
@@ -196,7 +193,9 @@ am__objects_4 = libscifileio_la-fileio_gw.lo \
        libscifileio_la-sci_getlongpathname.lo \
        libscifileio_la-sci_fileext.lo \
        libscifileio_la-sci_createdir.lo \
-       libscifileio_la-sci_fullpath.lo
+       libscifileio_la-sci_fullpath.lo \
+       libscifileio_la-sci_removedir.lo libscifileio_la-sci_meof.lo \
+       libscifileio_la-sci_mputstr.lo libscifileio_la-sci_mgetstr.lo
 am_libscifileio_la_OBJECTS = $(am__objects_3) $(am__objects_4)
 libscifileio_la_OBJECTS = $(am_libscifileio_la_OBJECTS)
 libscifileio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -502,12 +501,9 @@ src/c/getfiledesc.c \
 src/c/getfileinfo.c \
 src/c/getfiletype.c \
 src/c/mclearerr.c \
-src/c/meof.c \
 src/c/merror.c \
 src/c/mgeti.c \
-src/c/mgetstr.c \
 src/c/mputi.c \
-src/c/mputstr.c \
 src/c/mseek.c \
 src/c/mtell.c \
 src/c/readline.c \
@@ -547,14 +543,10 @@ sci_gateway/c/sci_fscanfMat.c \
 sci_gateway/c/sci_maxfiles.c \
 sci_gateway/c/sci_getdrives.c \
 sci_gateway/c/sci_pathsep.c \
-sci_gateway/c/sci_removedir.c \
 sci_gateway/c/sci_chdir.c \
 sci_gateway/c/sci_pwd.c \
 sci_gateway/c/sci_mclearerr.c \
 sci_gateway/c/sci_merror.c \
-sci_gateway/c/sci_mgetstr.c \
-sci_gateway/c/sci_moef.c \
-sci_gateway/c/sci_mputstr.c \
 sci_gateway/c/sci_mseek.c \
 sci_gateway/c/sci_mtell.c \
 sci_gateway/c/sci_newest.c \
@@ -584,7 +576,11 @@ GATEWAY_CPP_SOURCES = \
        sci_gateway/cpp/sci_getlongpathname.cpp \
        sci_gateway/cpp/sci_fileext.cpp \
        sci_gateway/cpp/sci_createdir.cpp \
-       sci_gateway/cpp/sci_fullpath.cpp
+       sci_gateway/cpp/sci_fullpath.cpp \
+       sci_gateway/cpp/sci_removedir.cpp \
+       sci_gateway/cpp/sci_meof.cpp \
+       sci_gateway/cpp/sci_mputstr.cpp \
+       sci_gateway/cpp/sci_mgetstr.cpp
 
 FILEIO_CPP_SOURCES = \
        src/cpp/expandPathVariable.cpp \
@@ -594,6 +590,7 @@ FILEIO_CPP_SOURCES = \
        src/cpp/mget.cpp \
        src/cpp/mputl.cpp \
        src/cpp/mgetl.cpp \
+       src/cpp/mgetstr.cpp \
        src/cpp/filemanager.cpp
 
 libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
@@ -844,7 +841,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-isdir.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mclearerr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mclose.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-meof.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-merror.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mget.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mgeti.Plo@am__quote@
@@ -855,7 +851,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mput.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mputi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mputl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mputstr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mseek.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-mtell.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_algo_la-os_wfopen.Plo@am__quote@
@@ -890,13 +885,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_maxfiles.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mclearerr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mclose.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_meof.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_merror.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mfprintf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mfscanf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mget.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mgetl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mgetstr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_moef.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mopen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_movefile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-sci_mput.Plo@am__quote@
@@ -1017,13 +1012,6 @@ libscifileio_algo_la-mclearerr.lo: src/c/mclearerr.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-mclearerr.lo `test -f 'src/c/mclearerr.c' || echo '$(srcdir)/'`src/c/mclearerr.c
 
-libscifileio_algo_la-meof.lo: src/c/meof.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -MT libscifileio_algo_la-meof.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-meof.Tpo -c -o libscifileio_algo_la-meof.lo `test -f 'src/c/meof.c' || echo '$(srcdir)/'`src/c/meof.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_algo_la-meof.Tpo $(DEPDIR)/libscifileio_algo_la-meof.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/meof.c' object='libscifileio_algo_la-meof.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-meof.lo `test -f 'src/c/meof.c' || echo '$(srcdir)/'`src/c/meof.c
-
 libscifileio_algo_la-merror.lo: src/c/merror.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -MT libscifileio_algo_la-merror.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-merror.Tpo -c -o libscifileio_algo_la-merror.lo `test -f 'src/c/merror.c' || echo '$(srcdir)/'`src/c/merror.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_algo_la-merror.Tpo $(DEPDIR)/libscifileio_algo_la-merror.Plo
@@ -1038,13 +1026,6 @@ libscifileio_algo_la-mgeti.lo: src/c/mgeti.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-mgeti.lo `test -f 'src/c/mgeti.c' || echo '$(srcdir)/'`src/c/mgeti.c
 
-libscifileio_algo_la-mgetstr.lo: src/c/mgetstr.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -MT libscifileio_algo_la-mgetstr.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-mgetstr.Tpo -c -o libscifileio_algo_la-mgetstr.lo `test -f 'src/c/mgetstr.c' || echo '$(srcdir)/'`src/c/mgetstr.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_algo_la-mgetstr.Tpo $(DEPDIR)/libscifileio_algo_la-mgetstr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/mgetstr.c' object='libscifileio_algo_la-mgetstr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-mgetstr.lo `test -f 'src/c/mgetstr.c' || echo '$(srcdir)/'`src/c/mgetstr.c
-
 libscifileio_algo_la-mputi.lo: src/c/mputi.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -MT libscifileio_algo_la-mputi.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-mputi.Tpo -c -o libscifileio_algo_la-mputi.lo `test -f 'src/c/mputi.c' || echo '$(srcdir)/'`src/c/mputi.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_algo_la-mputi.Tpo $(DEPDIR)/libscifileio_algo_la-mputi.Plo
@@ -1052,13 +1033,6 @@ libscifileio_algo_la-mputi.lo: src/c/mputi.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-mputi.lo `test -f 'src/c/mputi.c' || echo '$(srcdir)/'`src/c/mputi.c
 
-libscifileio_algo_la-mputstr.lo: src/c/mputstr.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -MT libscifileio_algo_la-mputstr.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-mputstr.Tpo -c -o libscifileio_algo_la-mputstr.lo `test -f 'src/c/mputstr.c' || echo '$(srcdir)/'`src/c/mputstr.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_algo_la-mputstr.Tpo $(DEPDIR)/libscifileio_algo_la-mputstr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/mputstr.c' object='libscifileio_algo_la-mputstr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -c -o libscifileio_algo_la-mputstr.lo `test -f 'src/c/mputstr.c' || echo '$(srcdir)/'`src/c/mputstr.c
-
 libscifileio_algo_la-mseek.lo: src/c/mseek.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_algo_la_CFLAGS) $(CFLAGS) -MT libscifileio_algo_la-mseek.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-mseek.Tpo -c -o libscifileio_algo_la-mseek.lo `test -f 'src/c/mseek.c' || echo '$(srcdir)/'`src/c/mseek.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_algo_la-mseek.Tpo $(DEPDIR)/libscifileio_algo_la-mseek.Plo
@@ -1318,13 +1292,6 @@ libscifileio_la-sci_pathsep.lo: sci_gateway/c/sci_pathsep.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_pathsep.lo `test -f 'sci_gateway/c/sci_pathsep.c' || echo '$(srcdir)/'`sci_gateway/c/sci_pathsep.c
 
-libscifileio_la-sci_removedir.lo: sci_gateway/c/sci_removedir.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_removedir.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_removedir.Tpo -c -o libscifileio_la-sci_removedir.lo `test -f 'sci_gateway/c/sci_removedir.c' || echo '$(srcdir)/'`sci_gateway/c/sci_removedir.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_removedir.Tpo $(DEPDIR)/libscifileio_la-sci_removedir.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_removedir.c' object='libscifileio_la-sci_removedir.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_removedir.lo `test -f 'sci_gateway/c/sci_removedir.c' || echo '$(srcdir)/'`sci_gateway/c/sci_removedir.c
-
 libscifileio_la-sci_chdir.lo: sci_gateway/c/sci_chdir.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_chdir.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_chdir.Tpo -c -o libscifileio_la-sci_chdir.lo `test -f 'sci_gateway/c/sci_chdir.c' || echo '$(srcdir)/'`sci_gateway/c/sci_chdir.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_chdir.Tpo $(DEPDIR)/libscifileio_la-sci_chdir.Plo
@@ -1353,27 +1320,6 @@ libscifileio_la-sci_merror.lo: sci_gateway/c/sci_merror.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_merror.lo `test -f 'sci_gateway/c/sci_merror.c' || echo '$(srcdir)/'`sci_gateway/c/sci_merror.c
 
-libscifileio_la-sci_mgetstr.lo: sci_gateway/c/sci_mgetstr.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_mgetstr.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mgetstr.Tpo -c -o libscifileio_la-sci_mgetstr.lo `test -f 'sci_gateway/c/sci_mgetstr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mgetstr.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_mgetstr.Tpo $(DEPDIR)/libscifileio_la-sci_mgetstr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mgetstr.c' object='libscifileio_la-sci_mgetstr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_mgetstr.lo `test -f 'sci_gateway/c/sci_mgetstr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mgetstr.c
-
-libscifileio_la-sci_moef.lo: sci_gateway/c/sci_moef.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_moef.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_moef.Tpo -c -o libscifileio_la-sci_moef.lo `test -f 'sci_gateway/c/sci_moef.c' || echo '$(srcdir)/'`sci_gateway/c/sci_moef.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_moef.Tpo $(DEPDIR)/libscifileio_la-sci_moef.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_moef.c' object='libscifileio_la-sci_moef.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_moef.lo `test -f 'sci_gateway/c/sci_moef.c' || echo '$(srcdir)/'`sci_gateway/c/sci_moef.c
-
-libscifileio_la-sci_mputstr.lo: sci_gateway/c/sci_mputstr.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_mputstr.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mputstr.Tpo -c -o libscifileio_la-sci_mputstr.lo `test -f 'sci_gateway/c/sci_mputstr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mputstr.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_mputstr.Tpo $(DEPDIR)/libscifileio_la-sci_mputstr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mputstr.c' object='libscifileio_la-sci_mputstr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_mputstr.lo `test -f 'sci_gateway/c/sci_mputstr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mputstr.c
-
 libscifileio_la-sci_mseek.lo: sci_gateway/c/sci_mseek.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_mseek.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mseek.Tpo -c -o libscifileio_la-sci_mseek.lo `test -f 'sci_gateway/c/sci_mseek.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mseek.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_mseek.Tpo $(DEPDIR)/libscifileio_la-sci_mseek.Plo
@@ -1493,6 +1439,13 @@ libscifileio_algo_la-mgetl.lo: src/cpp/mgetl.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_algo_la-mgetl.lo `test -f 'src/cpp/mgetl.cpp' || echo '$(srcdir)/'`src/cpp/mgetl.cpp
 
+libscifileio_algo_la-mgetstr.lo: src/cpp/mgetstr.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_algo_la-mgetstr.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-mgetstr.Tpo -c -o libscifileio_algo_la-mgetstr.lo `test -f 'src/cpp/mgetstr.cpp' || echo '$(srcdir)/'`src/cpp/mgetstr.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_algo_la-mgetstr.Tpo $(DEPDIR)/libscifileio_algo_la-mgetstr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/mgetstr.cpp' object='libscifileio_algo_la-mgetstr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_algo_la-mgetstr.lo `test -f 'src/cpp/mgetstr.cpp' || echo '$(srcdir)/'`src/cpp/mgetstr.cpp
+
 libscifileio_algo_la-filemanager.lo: src/cpp/filemanager.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_algo_la-filemanager.lo -MD -MP -MF $(DEPDIR)/libscifileio_algo_la-filemanager.Tpo -c -o libscifileio_algo_la-filemanager.lo `test -f 'src/cpp/filemanager.cpp' || echo '$(srcdir)/'`src/cpp/filemanager.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_algo_la-filemanager.Tpo $(DEPDIR)/libscifileio_algo_la-filemanager.Plo
@@ -1647,6 +1600,34 @@ libscifileio_la-sci_fullpath.lo: sci_gateway/cpp/sci_fullpath.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_fullpath.lo `test -f 'sci_gateway/cpp/sci_fullpath.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_fullpath.cpp
 
+libscifileio_la-sci_removedir.lo: sci_gateway/cpp/sci_removedir.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-sci_removedir.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_removedir.Tpo -c -o libscifileio_la-sci_removedir.lo `test -f 'sci_gateway/cpp/sci_removedir.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_removedir.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-sci_removedir.Tpo $(DEPDIR)/libscifileio_la-sci_removedir.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_removedir.cpp' object='libscifileio_la-sci_removedir.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_removedir.lo `test -f 'sci_gateway/cpp/sci_removedir.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_removedir.cpp
+
+libscifileio_la-sci_meof.lo: sci_gateway/cpp/sci_meof.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-sci_meof.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_meof.Tpo -c -o libscifileio_la-sci_meof.lo `test -f 'sci_gateway/cpp/sci_meof.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_meof.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-sci_meof.Tpo $(DEPDIR)/libscifileio_la-sci_meof.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_meof.cpp' object='libscifileio_la-sci_meof.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_meof.lo `test -f 'sci_gateway/cpp/sci_meof.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_meof.cpp
+
+libscifileio_la-sci_mputstr.lo: sci_gateway/cpp/sci_mputstr.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-sci_mputstr.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mputstr.Tpo -c -o libscifileio_la-sci_mputstr.lo `test -f 'sci_gateway/cpp/sci_mputstr.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_mputstr.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-sci_mputstr.Tpo $(DEPDIR)/libscifileio_la-sci_mputstr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_mputstr.cpp' object='libscifileio_la-sci_mputstr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_mputstr.lo `test -f 'sci_gateway/cpp/sci_mputstr.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_mputstr.cpp
+
+libscifileio_la-sci_mgetstr.lo: sci_gateway/cpp/sci_mgetstr.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-sci_mgetstr.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mgetstr.Tpo -c -o libscifileio_la-sci_mgetstr.lo `test -f 'sci_gateway/cpp/sci_mgetstr.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_mgetstr.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-sci_mgetstr.Tpo $(DEPDIR)/libscifileio_la-sci_mgetstr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_mgetstr.cpp' object='libscifileio_la-sci_mgetstr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_mgetstr.lo `test -f 'sci_gateway/cpp/sci_mgetstr.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_mgetstr.cpp
+
 mostlyclean-libtool:
        -rm -f *.lo
 
index 4dcfc4c..b89d594 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\meof.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\src\c\merror.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\mgetstr.c"
+                               RelativePath=".\src\cpp\mgetstr.cpp"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\mputstr.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\src\c\mseek.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\sci_gateway\c\sci_mgetstr.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\sci_gateway\c\sci_moef.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\sci_gateway\c\sci_movefile.c"
                                >
                        </File>
                        <File
-                               RelativePath=".\sci_gateway\c\sci_mputstr.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\sci_gateway\c\sci_mscanf.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\meof.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\src\c\merror.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\mgetstr.h"
+                               RelativePath=".\src\cpp\mgetstr.h"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\mputstr.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\includes\mseek.h"
                                >
                        </File>
index d4f1bcb..53e1a8f 100644 (file)
@@ -56,5 +56,9 @@ CPP_GATEWAY_PROTOTYPE(sci_getlongpathname);
 CPP_GATEWAY_PROTOTYPE(sci_fileext);
 CPP_GATEWAY_PROTOTYPE(sci_createdir);
 CPP_GATEWAY_PROTOTYPE(sci_fullpath);
+CPP_GATEWAY_PROTOTYPE(sci_removedir);
+CPP_GATEWAY_PROTOTYPE(sci_meof);
+CPP_GATEWAY_PROTOTYPE(sci_mputstr);
+CPP_GATEWAY_PROTOTYPE(sci_mgetstr);
 
 #endif /* !__FILEIO_GW_HXX__ */
index 7fc9ff2..b6e9bba 100644 (file)
 /*--------------------------------------------------------------------------*/
 FILEIO_IMPEXP int gw_fileio(void);
 /*--------------------------------------------------------------------------*/
-FILEIO_IMPEXP int sci_meof(char *fname,unsigned long fname_len);
 FILEIO_IMPEXP int sci_merror(char *fname,unsigned long fname_len);
-FILEIO_IMPEXP int sci_mputstr(char *fname,unsigned long fname_len);
-FILEIO_IMPEXP int sci_mgetstr(char *fname,unsigned long fname_len);
 FILEIO_IMPEXP int sci_mseek(char *fname,unsigned long fname_len);
 FILEIO_IMPEXP int sci_mtell(char *fname,unsigned long fname_len);
 FILEIO_IMPEXP int sci_mclearerr(char *fname,unsigned long fname_len);
@@ -31,7 +28,6 @@ FILEIO_IMPEXP int sci_fscanf(char *fname,unsigned long fname_len);
 FILEIO_IMPEXP int sci_maxfiles(char *fname,unsigned long fname_len);
 FILEIO_IMPEXP int sci_getdrives(char *fname,unsigned long fname_len);
 FILEIO_IMPEXP int sci_pathsep(char *fname,unsigned long fname_len);
-FILEIO_IMPEXP int sci_removedir(char *fname,unsigned long fname_len);
 FILEIO_IMPEXP int sci_newest(char *fname,unsigned long fname_len);
 FILEIO_IMPEXP int sci_getrelativefilename(char *fname, unsigned long l);
 FILEIO_IMPEXP int sci_get_absolute_file_path(char *fname,unsigned long fname_len);
index c3ece87..ed32efb 100644 (file)
 /*--------------------------------------------------------------------------*/
 static gw_generic_table Tab[]={
        {NULL, ""}, //mopen
-       {sci_mputstr, "mputstr"},
+       {NULL, ""}, //mputstr
        {NULL, ""}, //mclose
        {NULL, ""}, //mput
        {NULL, ""}, //mget
-       {sci_mgetstr, "mgetstr"},
-       {sci_meof, "meof"},
-       {sci_mseek, "mseek"},
-       {sci_mtell, "mtell"},
+       {NULL, ""}, //mgetstr
+       {NULL, ""}, //meof
+       {sci_mseek, "mseek"}, //
+       {sci_mtell, "mtell"}, //
        {sci_mclearerr, "mclearerr"},
-       {sci_mfprintf,"mfprintf"},
-       {sci_scanf,"mscanf"},
-       {sci_fscanf,"mfscanf"},
-       {sci_sscanf,"msscanf"},
+       {sci_mfprintf,"mfprintf"}, //
+       {sci_scanf,"mscanf"}, //
+       {sci_fscanf,"mfscanf"}, //
+       {sci_sscanf,"msscanf"}, //
        {sci_fscanfMat,"fscanfMat"},
        {sci_fprintfMat,"fprintfMat"},
        {sci_merror, "merror"},
        {NULL, ""}, //findfiles
        {sci_maxfiles,"maxfiles"},
        {sci_getdrives,"getdrives"},
-       {NULL, ""}, // fullpath
+       {NULL, ""}, //fullpath
        {NULL, ""}, //deletefile
        {sci_pathsep,"pathsep"},
        {NULL, ""}, //filesep
-       {NULL, ""}, // getlongpathname
-       {NULL ,""}, //getshortpathname
+       {NULL, ""}, //getlongpathname
+       {NULL, ""}, //getshortpathname
        {NULL, ""}, //fileext
        {NULL, ""}, //isdir
-       {sci_removedir,"removedir"},
-       {NULL,""}, //createdir
-       {NULL, ""}, // pwd
+       {NULL, ""}, //removedir
+       {NULL, ""}, //createdir
+       {NULL, ""}, //pwd
        {NULL, ""}, //chdir
        {NULL, ""}, //fileinfo
        {sci_newest,"newest"},
        {sci_getrelativefilename,"getrelativefilename"},
        {sci_get_absolute_file_path,"get_absolute_file_path"},
-       {NULL ,""}, //copyfile
+       {NULL, ""}, //copyfile
        {NULL, ""}, //isfile
        {NULL, ""}, //fileparts
        {NULL, ""}, //movefile
        {NULL, ""}, //basename
        {NULL, ""}, //pathconvert
-       {NULL, ""} //cd
+       {NULL, ""}  //cd
        };
 /*--------------------------------------------------------------------------*/
 int gw_fileio(void)
diff --git a/scilab/modules/fileio/sci_gateway/c/sci_mgetstr.c b/scilab/modules/fileio/sci_gateway/c/sci_mgetstr.c
deleted file mode 100644 (file)
index 87baf4a..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2006 - INRIA - Allan CORNET
-* Copyright (C) 2009 - DIGITEO - Allan CORNET
-* ...
-* 
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at    
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-/*--------------------------------------------------------------------------*/
-#include "stack-c.h"
-#include "gw_fileio.h"
-#include "mgetstr.h"
-#include "localization.h"
-#include "Scierror.h"
-/*--------------------------------------------------------------------------*/
-#define ALL_FILES_DESCRIPTOR -1
-/*--------------------------------------------------------------------------*/
-int sci_mgetstr(char *fname,unsigned long fname_len)
-{
-       int m1 = 0, n1 = 0, l1 = 0;
-       int m2 = 0, n2 = 0, l2 = 0;
-       int     l3 = 0;
-       int err = 0;
-       int fd = ALL_FILES_DESCRIPTOR;
-       int n = 1;
-       int one = 1;
-
-       Nbvars = 0;
-       CheckRhs(1,2);
-       CheckLhs(1,1);
-
-       if ( Rhs >= 1)
-       {
-               if (GetType(1) == sci_matrix)
-               {
-                       GetRhsVar(1,MATRIX_OF_INTEGER_DATATYPE,&m1,&n1,&l1);
-                       if (m1 *n1 == 1)
-                       {
-                               n  = *istk(l1);
-                       }
-                       else
-                       {
-                               Scierror(999, _("%s: Wrong size for input argument #%d: An integer expected.\n"), fname,1);
-                               return 0;
-                       }
-               }
-               else
-               {
-                       Scierror(999, _("%s: Wrong type for input argument #%d: An integer expected.\n"), fname,1);
-                       return 0;
-               }
-       }
-
-       if ( Rhs >= 2)
-       {
-               if (GetType(2) == sci_matrix)
-               {
-                       GetRhsVar(2,MATRIX_OF_INTEGER_DATATYPE,&m2,&n2,&l2);
-                       if (m2*n2 == 1)
-                       {
-                               fd = *istk(l2);
-                       }
-                       else
-                       {
-                               Scierror(999, _("%s: Wrong size for input argument #%d: An integer expected.\n"), fname,2);
-                               return 0;
-                       }
-               }
-               else
-               {
-                       Scierror(999, _("%s: Wrong type for input argument #%d: An integer expected.\n"), fname,2);
-                       return 0;
-               }
-       }
-
-       CreateVar(Rhs+1,STRING_DATATYPE,&n,&one,&l3);
-
-       C2F(mgetstr1)(&fd, cstk(l3), &n, &err);
-
-       LhsVar(1) = Rhs+1;
-       if (err >  0)
-       {
-               SciError(10000);
-               return 0;
-       }
-       else if ( err < 0)
-       {
-               int n5 = 0, l5 = 0;
-               /* n contains now the effectively read data */
-               n5 = -err -1;
-               if ( n5 < n )
-               {
-                       CreateVar(Rhs+2,STRING_DATATYPE,&one,&n5,&l5);
-                       strcpy(cstk(l5),cstk(l3));
-                       LhsVar(1) = Rhs+2;
-               }
-       }
-
-       PutLhsVar();
-
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/sci_gateway/c/sci_moef.c b/scilab/modules/fileio/sci_gateway/c/sci_moef.c
deleted file mode 100644 (file)
index 189f835..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2006 - INRIA - Allan CORNET
-* Copyright (C) 2009 - DIGITEO - Allan CORNET
-* ...
-* 
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at    
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-/*--------------------------------------------------------------------------*/
-#include "stack-c.h"
-#include "gw_fileio.h"
-#include "meof.h"
-#include "localization.h"
-#include "Scierror.h"
-/*--------------------------------------------------------------------------*/
-#define ALL_FILES_DESCRIPTOR -1
-/*--------------------------------------------------------------------------*/
-int sci_meof(char *fname,unsigned long fname_len)
-{
-       int m1 = 0, n1 = 0, l1 = 0;
-       int one = 1;
-       int lr = 0;
-       int fd = ALL_FILES_DESCRIPTOR;
-
-       Nbvars = 0;
-       CheckRhs(0,1);
-       CheckLhs(1,1);
-
-       if ( Rhs >= 1)
-       {
-               if (GetType(1) == sci_matrix)
-               {
-                       GetRhsVar(1, MATRIX_OF_INTEGER_DATATYPE, &m1, &n1, &l1);
-                       if (m1*n1 == 1)
-                       {
-                               fd  = *istk(l1);
-                       }
-                       else
-                       {
-                               Scierror(999, _("%s: Wrong size for input argument #%d: An integer expected.\n"), fname,1);
-                               return 0;
-                       }
-               }
-               else
-               {
-                       Scierror(999, _("%s: Wrong type for input argument #%d: An integer expected.\n"), fname,1);
-                       return 0;
-               }
-       }
-
-       CreateVar(Rhs+1, MATRIX_OF_DOUBLE_DATATYPE, &one, &one, &lr);
-
-       C2F(meof)(&fd,stk(lr));
-
-       LhsVar(1)= Rhs+1;
-       PutLhsVar();
-
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/sci_gateway/c/sci_mputstr.c b/scilab/modules/fileio/sci_gateway/c/sci_mputstr.c
deleted file mode 100644 (file)
index f01cdc4..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2006 - INRIA - Allan CORNET
-* Copyright (C) 2009 - DIGITEO - Allan CORNET
-* ...
-* 
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at    
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-/*--------------------------------------------------------------------------*/
-#include "stack-c.h"
-#include "gw_fileio.h"
-#include "mputstr.h"
-#include "localization.h"
-#include "Scierror.h"
-/*--------------------------------------------------------------------------*/
-#define ALL_FILES_DESCRIPTOR -1
-/*--------------------------------------------------------------------------*/
-int sci_mputstr(char *fname,unsigned long fname_len)
-{
-       int m1 = 0, n1 = 0, l1 = 0;
-       int     m2 = 0, n2 = 0, l2 = 0;
-       int     l3 = 0;
-       int     err = 0;
-       int one = 1;
-       int fd = ALL_FILES_DESCRIPTOR;
-
-       Nbvars = 0 ;
-       CheckRhs(1,2);
-       CheckLhs(1,1);
-
-       /*  checking variable file */
-       if (GetType(1) == sci_strings)
-       {
-               GetRhsVar(1,STRING_DATATYPE,&m1,&n1,&l1);
-       }
-       else
-       {
-               Scierror(999, _("%s: Wrong type for input argument #%d: A string expected.\n"), fname,1);
-               return 0;
-       }
-
-       if ( Rhs >= 2)
-       {
-               if (GetType(2) == sci_matrix)
-               {
-                       GetRhsVar(2,MATRIX_OF_INTEGER_DATATYPE,&m2,&n2,&l2);
-                       if (m2*n2 == 1)
-                       {
-                               fd = *istk(l2);
-                       }
-                       else
-                       {
-                               Scierror(999, _("%s: Wrong size for input argument #%d: An integer expected.\n"), fname,2);
-                               return 0;
-                       }
-               }
-               else
-               {
-                       Scierror(999, _("%s: Wrong type for input argument #%d: An integer expected.\n"), fname,2);
-                       return 0;
-               }
-       }
-
-       CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE, &one,&one, &l3);
-
-       C2F(mputstr)(&fd,cstk(l1),stk(l3),&err);
-
-       if (err >  0)
-       {
-               SciError(10000);
-               return 0;
-       }
-
-       LhsVar(1) = Rhs+1;
-       PutLhsVar();
-
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
index 9d26f05..171b208 100644 (file)
@@ -47,5 +47,9 @@ bool FileioModule::Load()
     symbol::Context::getInstance()->AddFunction(Function::createFunction(L"createdir", &sci_createdir, MODULE_NAME));
     symbol::Context::getInstance()->AddFunction(Function::createFunction(L"fullpath", &sci_fullpath, MODULE_NAME));
     symbol::Context::getInstance()->AddFunction(Function::createFunction(L"copyfile", &sci_copyfile, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(Function::createFunction(L"removedir", &sci_removedir, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(Function::createFunction(L"meof", &sci_meof, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(Function::createFunction(L"mputstr", &sci_mputstr, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(Function::createFunction(L"mgetstr", &sci_mgetstr, MODULE_NAME));
     return true;
 }
index 4602061..88d8059 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath=".\sci_meof.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\sci_mget.cpp"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\sci_mgetstr.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\sci_mopen.cpp"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\sci_mputstr.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\sci_pathconvert.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath=".\sci_removedir.cpp"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/scilab/modules/fileio/sci_gateway/cpp/sci_meof.cpp b/scilab/modules/fileio/sci_gateway/cpp/sci_meof.cpp
new file mode 100644 (file)
index 0000000..e717e1d
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - Digiteo - Cedric DELAMARRE
+ * 
+ *
+ * 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
+ *
+ */
+/*--------------------------------------------------------------------------*/
+#include "funcmanager.hxx"
+#include "fileio_gw.hxx"
+#include "function.hxx"
+#include "string.hxx"
+#include "filemanager.hxx"
+
+extern "C"
+{
+#include <stdio.h>
+#include <string.h>
+#include "MALLOC.h"
+#include "removedir.h"
+#include "isdir.h"
+#include "expandPathVariable.h"
+#include "sci_warning.h"
+#include "sciprint.h"
+#include "Scierror.h"
+#include "localization.h"
+#include "PATH_MAX.h"
+}
+/*--------------------------------------------------------------------------*/
+
+
+Function::ReturnValue sci_meof(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    int iRet  = 0;
+    int iFile = -1; //default file : last opened file
+    
+    if(in.size() > 1)
+    {
+        ScierrorW(77, _W("%ls: Wrong number of input argument(s): %d to %d expected.\n"), L"meof", 0, 1);
+        return types::Function::Error;
+    }
+    if(in.size() == 1)
+    {
+        if(in[0]->isDouble() == false || in[0]->getAs<types::Double>()->isScalar() == false || in[1]->getAs<types::Double>()->isComplex())
+        {
+            ScierrorW(999,_W("%ls: Wrong type for input argument #%d: A real expected.\n"), L"meof", 1);
+            return types::Function::Error;
+        }
+
+        iFile = (int)in[0]->getAs<types::Double>()->get(0);
+    }
+    
+    File* pF = FileManager::getFile(iFile);
+    if(pF != NULL)
+    {
+        iRet = feof(pF->getFiledesc());
+    }
+    else
+    {
+        if (getWarningMode()) 
+        {
+            sciprintW(_W("%ls: Cannot check the end of file whose descriptor is %d: File is not active.\n"), L"meof", iFile);
+        }
+        return types::Function::OK;
+    }
+    
+    Bool* pOut = new Bool(iRet);
+    out.push_back(pOut);
+    return types::Function::OK;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/sci_gateway/cpp/sci_mgetstr.cpp b/scilab/modules/fileio/sci_gateway/cpp/sci_mgetstr.cpp
new file mode 100644 (file)
index 0000000..ade297a
--- /dev/null
@@ -0,0 +1,86 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2006 - INRIA - Allan CORNET
+* Copyright (C) 2009 - DIGITEO - Allan CORNET
+* Copyright (C) 2010 - DIGITEO - Antoine ELIAS
+* Copyright (C) 2011 - DIGITEO - Cedric DELAMARRE
+*
+* 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
+*
+*/
+/*--------------------------------------------------------------------------*/
+#include "funcmanager.hxx"
+#include "filemanager.hxx"
+#include "fileio_gw.hxx"
+#include "function.hxx"
+#include "string.hxx"
+
+extern "C"
+{
+#include <stdio.h>
+#include "localization.h"
+#include "Scierror.h"
+#include "charEncoding.h"
+#include "mgetstr.h"
+}
+/*--------------------------------------------------------------------------*/
+Function::ReturnValue sci_mgetstr(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    int iDims                   = 2;
+    int iDimsArray[2]           = {1,1};
+    int iFile                   = -1; //default file : last opened file
+    types::String* pOutString   = NULL;
+    int iSizeToRead             = 0;
+    types::Double* pdFileId     = NULL;
+    
+    if(in.size() < 1 || in.size() > 2)
+    {
+        ScierrorW(77, _W("%ls: Wrong number of input argument(s): %d to %d expected.\n"), L"mgetstr", 1, 2);
+        return types::Function::Error;
+    }
+
+    if(in[0]->isDouble() == false || in[0]->getAs<types::Double>()->isScalar() == false || in[0]->getAs<types::Double>()->isComplex())
+    {
+        ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A real expected.\n"), L"mgetstr", 1);
+        return types::Function::Error;
+    }
+    
+    iSizeToRead = static_cast<int>(in[0]->getAs<types::Double>()->getReal()[0]);
+    
+    if(in.size() == 2)
+    {
+        if(in[1]->isDouble() == false || in[1]->getAs<types::Double>()->isScalar() == false || in[1]->getAs<types::Double>()->isComplex())
+        {
+            ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A real expected.\n"), L"mgetstr", 2);
+            return types::Function::Error;
+        }
+        pdFileId = in[1]->getAs<types::Double>();
+    }
+
+    pOutString = new types::String(iDims,iDimsArray);
+
+    if(pdFileId != NULL)
+    {
+        iFile = static_cast<int>(pdFileId->getReal()[0]);
+    }
+    
+    wchar_t* pwstOut = mgetstr(iFile, iSizeToRead);
+    if(pwstOut == NULL)
+    {
+ //       ScierrorW(999, _W("%ls: Unable to read file %d.\n"), L"mgetstr", iFile);
+//        return types::Function::Error;
+    }
+    else
+    {
+        pOutString->set(0, pwstOut);
+    }
+    
+    FREE(pwstOut);
+    out.push_back(pOutString);
+    return Function::OK;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/sci_gateway/cpp/sci_mputstr.cpp b/scilab/modules/fileio/sci_gateway/cpp/sci_mputstr.cpp
new file mode 100644 (file)
index 0000000..9dd1d1b
--- /dev/null
@@ -0,0 +1,103 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2006 - INRIA - Allan CORNET
+* Copyright (C) 2009 - DIGITEO - Allan CORNET
+* Copyright (C) 2010 - DIGITEO - Antoine ELIAS
+* Copyright (C) 2011 - DIGITEO - Cedric DELAMARRE
+*
+* 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
+*
+*/
+/*--------------------------------------------------------------------------*/
+#include "funcmanager.hxx"
+#include "filemanager.hxx"
+#include "fileio_gw.hxx"
+#include "function.hxx"
+#include "string.hxx"
+
+extern "C"
+{
+#include "mputl.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "charEncoding.h"
+#include "sci_warning.h"
+}
+/*--------------------------------------------------------------------------*/
+Function::ReturnValue sci_mputstr(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    int iFile               = -1; //default file : last opened file
+    int iRet                = 0;
+    types::String* pString  = NULL;
+    types::Double* pdFileId = NULL;
+    File* pF                = NULL;
+    
+    if(in.size() < 1 || in.size() > 2)
+    {
+        ScierrorW(77, _W("%ls: Wrong number of input argument(s): %d to %d expected.\n"), L"mputstr", 1, 2);
+        return types::Function::Error;
+    }
+
+    if(in[0]->isString() == false || in[0]->getAs<types::String>()->isScalar() == false)
+    {
+        ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A string expected.\n"), L"mputstr", 1);
+        return types::Function::Error;
+    }
+    
+    pString = in[0]->getAs<types::String>();
+
+    if(in.size() == 2)
+    {
+        if(in[1]->isDouble() == false || in[1]->getAs<types::Double>()->isScalar() == false|| in[1]->getAs<types::Double>()->isComplex())
+        {
+            ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A real expected.\n"), L"mputstr", 2);
+            return types::Function::Error;
+        }
+        pdFileId = in[1]->getAs<types::Double>();
+    }
+
+    int iErr = mputl(iFile, pString->get(), 1);
+    out.push_back(new Bool(!iErr));
+
+/*
+    if(pdFileId != NULL)
+    {
+        iFile = static_cast<int>(pdFileId->getReal()[0]);
+        pF = FileManager::getFile(iFile);
+    }
+    else
+    {
+        pF = FileManager::getFile(iFile);
+    }
+        
+    if(pF != NULL)
+    {
+
+        if(fwprintf(pF->getFiledesc(),L"%ls",pString->get(0)) >= 0)
+        {
+            iRet = 1;
+        }
+        else
+        {
+            ScierrorW(999, _W("%ls: Error while writing.\n"), L"mputstr");
+        }
+    }
+    else
+    {
+        if (getWarningMode()) 
+        {
+            ScierrorW(999,_W("%ls: Cannot write in file whose descriptor is %d: File is not active.\n"), L"mputstr", iFile);
+        }
+        return types::Function::OK;
+    }
+    
+    Bool* pOut = new Bool(iRet);
+    out.push_back(pOut);
+*/
+    return Function::OK;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/sci_gateway/cpp/sci_removedir.cpp b/scilab/modules/fileio/sci_gateway/cpp/sci_removedir.cpp
new file mode 100644 (file)
index 0000000..5c2f53c
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2011 - Digiteo - Cedric DELAMARRE
+ * 
+ *
+ * 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
+ *
+ */
+/*--------------------------------------------------------------------------*/
+#include "funcmanager.hxx"
+#include "fileio_gw.hxx"
+#include "function.hxx"
+#include "string.hxx"
+
+extern "C"
+{
+#include <string.h>
+#include "MALLOC.h"
+#include "removedir.h"
+#include "isdir.h"
+#include "expandPathVariable.h"
+#include "sci_warning.h"
+#include "sciprint.h"
+#include "Scierror.h"
+#include "localization.h"
+#include "PATH_MAX.h"
+}
+/*--------------------------------------------------------------------------*/
+
+using namespace types;
+
+Function::ReturnValue sci_removedir(typed_list &in, int _iRetCount, typed_list &out)
+{
+    if(in.size() != 1)
+    {
+        ScierrorW(77, _W("%ls: Wrong number of input argument(s): %d expected.\n"), L"removedir", 1);
+        return Function::Error;
+    }
+
+    if(in[0]->isString() == false || in[0]->getAs<types::String>()->getSize() != 1)
+    {
+        ScierrorW(999,_W("%ls: Wrong type for input argument #%d: A String expected.\n"), L"removedir", 1);
+        return Function::Error;
+    }
+
+    wchar_t* pwstPath = expandPathVariableW(in[0]->getAs<types::String>()->get(0));
+    int iRet = 0;
+    if(!isdirW(pwstPath))
+    {
+        if(getWarningMode())
+        {
+            sciprintW(_W("%ls: Warning: Directory '%ls' doesn't exists.\n"), L"removedir", pwstPath);
+        }
+    }
+    else
+    {
+        iRet = removedirW(pwstPath);       
+    }
+
+    FREE(pwstPath);
+    Bool* pOut = new Bool(iRet);
+
+    out.push_back(pOut);
+    return Function::OK;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/src/c/meof.c b/scilab/modules/fileio/src/c/meof.c
deleted file mode 100644 (file)
index d1871ad..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - 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
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <stdio.h>
-#include "meof.h"
-#include "filesmanagement.h"
-/*--------------------------------------------------------------------------*/
-void C2F(meof) (int *fd, double *res)
-{       
-       FILE *fa= GetFileOpenedInScilab(*fd);
-       *res = fa ? feof(fa) : 1;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/src/c/meof.h b/scilab/modules/fileio/src/c/meof.h
deleted file mode 100644 (file)
index cc83281..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - 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 __MEOF_H__
-#define __MEOF_H__
-
-#include "machine.h"
-
-/**
- * check eof 
- *
- * @param fd    
- * @param res   
- */
-void C2F(meof) (int *fd, double *res);
-
-#endif /* __MEOF_H__ */
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/src/c/mgetstr.c b/scilab/modules/fileio/src/c/mgetstr.c
deleted file mode 100644 (file)
index 7b467e7..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - 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
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <stdio.h>
-#include "mgetstr.h"
-#include "filesmanagement.h"
-#include "MALLOC.h"
-#include "sciprint.h"
-#include "localization.h"
-/*--------------------------------------------------------------------------*/
-void C2F(mgetstr1) (int *fd, char *start, int *n, int *ierr)
-{ 
-       int count=0;
-       FILE *fa=NULL;
-       fa = GetFileOpenedInScilab(*fd);
-       *ierr=0;
-       if (fa)
-       { 
-               count=(int)fread(start,sizeof(char),*n,fa);
-               start[*n]='\0';
-               if ( count != *n ) 
-               {
-                       *ierr = - count -1;
-               }
-               return;
-       }
-       sciprint(_("%s: No input file.\n"),"mgetstr");
-       *ierr=1;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/src/c/mgetstr.h b/scilab/modules/fileio/src/c/mgetstr.h
deleted file mode 100644 (file)
index cfb06e4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - 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 __MGETSTR_H__
-#define __MGETSTR_H__
-
-#include "machine.h"
-
-/**
- * read a string 
- *
- * @param fd    
- * @param start 
- * @param n 
- * @param ierr  
- */
-void C2F(mgetstr1) (int *fd, char *start, int *n, int *ierr);
-
-#endif /* __MGETSTR_H__ */
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/src/c/mputstr.c b/scilab/modules/fileio/src/c/mputstr.c
deleted file mode 100644 (file)
index baf6207..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - 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
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <stdio.h> /* FILE */
-#include "mputstr.h"
-#include "filesmanagement.h"
-#include "sciprint.h"
-#include "localization.h"
-/*--------------------------------------------------------------------------*/
-void C2F(mputstr) (int *fd, char *str, double *res, int *ierr)
-{   
-       FILE *fa=NULL;
-       fa = GetFileOpenedInScilab(*fd);
-       if (!fa) 
-       {
-               char *filename = GetFileNameOpenedInScilab(*fd);
-               if (filename)
-               {
-                       sciprint(_("%s: Error while opening, reading or writing '%s'.\n"),"mputstr",filename);
-               }
-               else
-               {
-                       sciprint(_("%s: Error while opening, reading or writing.\n"),"mputstr");
-               }
-               *ierr=1;
-       }
-       else 
-       {
-               fprintf(fa,"%s",str);
-               (*res) = (*ierr) =ferror(fa);
-       }
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/src/c/mputstr.h b/scilab/modules/fileio/src/c/mputstr.h
deleted file mode 100644 (file)
index d6f9e11..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - 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 __MPUTSTR_H__
-#define __MPUTSTR_H__
-
-#include "dynlib_fileio.h"
-#include "machine.h"
-
-/**
-* write a string 
-*/
-FILEIO_IMPEXP void C2F(mputstr) (int *fd, char *str, double *res, int *ierr);
-
-#endif /* __MPUTSTR_H__ */
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/src/cpp/mgetstr.cpp b/scilab/modules/fileio/src/cpp/mgetstr.cpp
new file mode 100644 (file)
index 0000000..102bea2
--- /dev/null
@@ -0,0 +1,67 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2011 - DIGITEO - Cedric DELAMARRE
+*
+* 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
+*
+*/
+
+#include <string.h>
+#include "filemanager.hxx"
+
+extern "C"
+{
+#include "mgetstr.h"
+#include "filesmanagement.h"
+#include "MALLOC.h"
+#include "charEncoding.h"
+}
+
+wchar_t* mgetstr(int _iFileId, int _iSizeToRead)
+{
+    wchar_t* pwstOut = NULL;
+    File* pF = FileManager::getFile(_iFileId);
+    int iSizeToRead = _iSizeToRead + 1; //fgetws and fgets need length to read + 1
+    
+    if(pF != NULL)
+    {
+        if(static_cast<int>(pF->getFileModeAsDouble()) % 2 == 1)
+        {
+            printf("Binary mode\n");
+            pwstOut = (wchar_t*)MALLOC(iSizeToRead * sizeof(wchar_t));
+            memset(pwstOut, 0x00, iSizeToRead * sizeof(wchar_t));
+            wchar_t* pwstRes = fgetws(pwstOut, iSizeToRead, pF->getFiledesc());
+            if(pwstRes == NULL)
+            {
+                FREE(pwstOut);
+                return NULL;
+            }
+        }
+        else
+        {
+            printf("Text mode\n");
+            char* buffer = (char*)MALLOC(iSizeToRead * sizeof(char));
+            memset(buffer, 0x00, iSizeToRead * sizeof(char));
+
+            char* pstRes = fgets(buffer, iSizeToRead, pF->getFiledesc());
+            if(pstRes == NULL)
+            {
+                FREE(buffer);
+                return NULL;
+            }
+            
+            pwstOut = to_wide_string(buffer);
+            FREE(buffer);
+        }
+    }
+    else
+    {
+        return NULL;
+    }
+    
+    return pwstOut;
+}
diff --git a/scilab/modules/fileio/src/cpp/mgetstr.h b/scilab/modules/fileio/src/cpp/mgetstr.h
new file mode 100644 (file)
index 0000000..ec83831
--- /dev/null
@@ -0,0 +1,21 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2011 - DIGITEO - Cedric DELAMARRE
+* 
+* 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 __MGETSTR_H__
+#define __MGETSTR_H__
+
+#include "dynlib_fileio.h"
+
+FILEIO_IMPEXP wchar_t* mgetstr(int _iFileId, int _iSizeToRead);
+
+#endif /* !__MGETSTR_H__ */
+