Changeset: bb09873c73ea for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bb09873c73ea
Modified Files:
        tools/merovingian/client/CMakeLists.txt
        tools/merovingian/client/monetdb.c
Branch: Jan2022
Log Message:

Initialize stream library before use.


diffs (34 lines):

diff --git a/tools/merovingian/client/CMakeLists.txt 
b/tools/merovingian/client/CMakeLists.txt
--- a/tools/merovingian/client/CMakeLists.txt
+++ b/tools/merovingian/client/CMakeLists.txt
@@ -23,6 +23,7 @@ target_link_libraries(monetdb
   mcrypt
   msabaoth
   mutils
+  stream
   #$<$<BOOL:${Iconv_FOUND}>:Iconv::Iconv>)
   )
 
diff --git a/tools/merovingian/client/monetdb.c 
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -26,6 +26,7 @@
 #include "control.h"
 #include "msabaoth.h"
 #include "mutils.h"
+#include "stream.h"
 #include <string.h> /* strerror */
 #include <sys/stat.h> /* mkdir, stat, umask */
 #include <sys/types.h> /* mkdir, readdir */
@@ -2383,6 +2384,11 @@ main(int argc, char *argv[])
                TERMWIDTH = ws.ws_col;
 #endif
 
+       if (mnstr_init() < 0) {
+               fprintf(stderr, "monetdb: cannot initialize stream library\n");
+               return 1;
+       }
+
        /* Start handling the arguments.
         * monetdb [monetdb_options] command [options] [database [...]]
         * this means we first scout for monetdb_options which stops as soon
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to