Changeset: 2ee9ce990e44 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ee9ce990e44
Modified Files:
common/utils/mutils.c
Branch: default
Log Message:
Merged from Apr2011
diffs (41 lines):
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -44,6 +44,10 @@
# include <limits.h> /* PATH_MAX on Solaris */
#endif
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h> /* KERN_PROC_PATHNAME on BSD */
+#endif
+
#ifdef NATIVE_WIN32
#include <stdio.h>
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -607,7 +607,7 @@
/* absolutise dbfarm if it isn't yet (we're in it now) */
if (*dbfarm != '/') {
dbfarm = alloca(1024);
- if (getcwd(dbfarm, sizeof(1024)) == NULL) {
+ if (getcwd(dbfarm, 1024) == NULL) {
Mfprintf(stderr, "could not get dbfarm working
directory: %s\n",
strerror(errno));
MERO_EXIT(1);
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -446,6 +446,11 @@
break;
}
}
+ } else {
+ printf("#warning: unable to determine binary location, "
+ "please use --set
monet_mod_path=/path/to/... to "
+ "allow finding modules\n");
+ fflush(NULL);
}
if (modpath != NULL)
GDKsetenv("monet_mod_path", modpath);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
