Changeset: e80809cba769 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e80809cba769
Modified Files:
common/stream/stream.c
java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
Branch: embedded-java
Log Message:
Set installdir using bindir for now.
Backport cvfilename fix
diffs (58 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -298,9 +298,10 @@ cvfilename(const char *filename)
size_t size = 4 * len;
ICONV_CONST char *from = (ICONV_CONST char *) filename;
char *r = malloc(size);
+ char *p = r;
if (r &&
- iconv(cd, &from, &len, &r, &size) != (size_t) -1) {
+ iconv(cd, &from, &len, &p, &size) != (size_t) -1) {
iconv_close(cd);
return r;
} else if (r)
diff --git a/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
b/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
--- a/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
+++ b/java/embedded/org_monetdb_embedded_MonetDBEmbedded.c
@@ -20,7 +20,8 @@ JNIEXPORT jboolean JNICALL Java_org_mone
(JNIEnv *env, jobject object, jstring directory, jboolean silent) {
(void)object;
const char *directory_string_tmp = (*env)->GetStringUTFChars(env,
directory, 0);
- char *directory_string = strdup(directory_string_tmp);
+ char *databaseDirectory = strdup(directory_string_tmp);
+ char installationDirectory[1000];
unsigned char silent_char = 'n';
char *err;
jclass exClass = (*env)->FindClass(env, "java/io/IOException");
@@ -29,7 +30,7 @@ JNIEXPORT jboolean JNICALL Java_org_mone
// Check if we already have a running db
if (running) {
- if (strcmp(directory_string, runningDirectory) == 0) {
+ if (strcmp(databaseDirectory, runningDirectory) == 0) {
return true;
}
// Throw a Java exception
@@ -47,8 +48,9 @@ JNIEXPORT jboolean JNICALL Java_org_mone
silent_char = 'y';
}
- // XXX: hardcoded install dir for now. fix, soon!
- err = monetdb_startup("/Users/dnedev/monetdb/installation",
directory_string, silent_char);
+ // XXX: still relying on bindir
+ snprintf(installationDirectory, 1000, "%s../", BINDIR);
+ err = monetdb_startup(BINDIR, databaseDirectory, silent_char);
// Checking for errors
if (err != NULL) {
if (exClass == NULL) {
@@ -61,7 +63,7 @@ JNIEXPORT jboolean JNICALL Java_org_mone
// set the flags
running = true;
- runningDirectory = directory_string;
+ runningDirectory = databaseDirectory;
return true;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
