diff --git a/build_linux64/libamsstring4.linux64.a b/build_linux64/libamsstring4.linux64.a index 11eed94..c53b272 100644 Binary files a/build_linux64/libamsstring4.linux64.a and b/build_linux64/libamsstring4.linux64.a differ diff --git a/build_linux64/objstore/amsstring4_class.o b/build_linux64/objstore/amsstring4_class.o index d315449..ae27560 100644 Binary files a/build_linux64/objstore/amsstring4_class.o and b/build_linux64/objstore/amsstring4_class.o differ diff --git a/build_linux64/tests b/build_linux64/tests index a1edad6..a8c60df 100644 Binary files a/build_linux64/tests and b/build_linux64/tests differ diff --git a/build_mingw64/libamsstring4.mingw64.a b/build_mingw64/libamsstring4.mingw64.a index bb4eb87..28f85d8 100644 Binary files a/build_mingw64/libamsstring4.mingw64.a and b/build_mingw64/libamsstring4.mingw64.a differ diff --git a/build_mingw64/objstore/amsstring4_bintextencoding.o b/build_mingw64/objstore/amsstring4_bintextencoding.o index dcd3668..d06c59c 100644 Binary files a/build_mingw64/objstore/amsstring4_bintextencoding.o and b/build_mingw64/objstore/amsstring4_bintextencoding.o differ diff --git a/build_mingw64/objstore/amsstring4_class.o b/build_mingw64/objstore/amsstring4_class.o index 1a7ce54..1ad9255 100644 Binary files a/build_mingw64/objstore/amsstring4_class.o and b/build_mingw64/objstore/amsstring4_class.o differ diff --git a/build_mingw64/objstore/amsstring4_portability.o b/build_mingw64/objstore/amsstring4_portability.o index 391322e..0dd1dce 100644 Binary files a/build_mingw64/objstore/amsstring4_portability.o and b/build_mingw64/objstore/amsstring4_portability.o differ diff --git a/build_mingw64/objstore/amsstring4_template.o b/build_mingw64/objstore/amsstring4_template.o index b8a067a..c778db4 100644 Binary files a/build_mingw64/objstore/amsstring4_template.o and b/build_mingw64/objstore/amsstring4_template.o differ diff --git a/build_mingw64/objstore/amsstring4_unicode.o b/build_mingw64/objstore/amsstring4_unicode.o index 2183de2..abc0fd7 100644 Binary files a/build_mingw64/objstore/amsstring4_unicode.o and b/build_mingw64/objstore/amsstring4_unicode.o differ diff --git a/build_mingw64/tests.exe b/build_mingw64/tests.exe index bc3f4d7..e17f6ab 100644 Binary files a/build_mingw64/tests.exe and b/build_mingw64/tests.exe differ diff --git a/include/amsstring4/amsstring4.hpp b/include/amsstring4/amsstring4.hpp index 64fcbac..40ac67b 100644 --- a/include/amsstring4/amsstring4.hpp +++ b/include/amsstring4/amsstring4.hpp @@ -151,6 +151,8 @@ void fwritelines(FILE *fp, amsstring *s); void fwritelines(FILE *fp, std::vector *lines); void freadtxtfile(FILE *fp, amsstring *s); +int readtextfile(const amsstring fname, amsstring *s); + }; //end namespace ams #include diff --git a/src/amsstring4/amsstring4_class.cpp b/src/amsstring4/amsstring4_class.cpp index 184a780..087e128 100644 --- a/src/amsstring4/amsstring4_class.cpp +++ b/src/amsstring4/amsstring4_class.cpp @@ -1493,6 +1493,25 @@ namespace ams } return; } + + int readtextfile(const amsstring fname, amsstring *s) + { + int ret = 1; + FILE *fp = NULL; + + fp = fopen(fname.cstring, "r"); + if(fp==NULL) + { + printf("readtextfile: could not open %s for reading.\n",fname.cstring); + ret = 0; + return ret; + } + + freadtxtfile(fp,s); + + fclose(fp); fp=NULL; + return ret; + } amsstring amsstring::operator+(const amsstring &other) { diff --git a/src/main.cpp b/src/main.cpp index 6400ce7..7351999 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,7 +20,7 @@ int main(int argc, char* argv[]) amsstring4_test_strip(); amsstring4_test_freadwrite(); - amsstring4_test_concatenation_operators(); //segfault on Debian11? + amsstring4_test_concatenation_operators(); return ret; } \ No newline at end of file