Changeset: c33c1522eaae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c33c1522eaae
Modified Files:
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/utils/glob.c
tools/merovingian/utils/glob.h
Branch: Dec2016
Log Message:
Merge with Jun2016 branch.
diffs (87 lines):
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
@@ -479,7 +479,7 @@ globMatchDBS(int argc, char *argv[], sab
if (argv[i] != NULL) {
prev = NULL;
for (stats = *orig; stats != NULL; stats = stats->next)
{
- if (glob(argv[i], stats->dbname)) {
+ if (db_glob(argv[i], stats->dbname)) {
matched = 1;
/* move out of orig into w, such that
we can't
* get double matches in the same
output list
@@ -918,7 +918,7 @@ command_discover(int argc, char *argv[])
snprintf(path, sizeof(path), "%s%s", q, p);
- if (match == NULL || glob(match, path)) {
+ if (match == NULL || db_glob(match, path)) {
if (twidth > 0) {
/* cut too long location name */
abbreviateString(location, path,
twidth);
diff --git a/tools/merovingian/daemon/discoveryrunner.c
b/tools/merovingian/daemon/discoveryrunner.c
--- a/tools/merovingian/daemon/discoveryrunner.c
+++ b/tools/merovingian/daemon/discoveryrunner.c
@@ -177,7 +177,7 @@ getRemoteDB(char *database)
pdb = &dummy;
while (rdb != NULL) {
snprintf(mfullname, sizeof(mfullname), "%s/", rdb->fullname);
- if (glob(mdatabase, mfullname) == 1) {
+ if (db_glob(mdatabase, mfullname) == 1) {
/* create a fake sabdb struct, chain where necessary */
if (walk != NULL) {
walk = walk->next = malloc(sizeof(sabdb));
diff --git a/tools/merovingian/daemon/multiplex-funnel.c
b/tools/merovingian/daemon/multiplex-funnel.c
--- a/tools/merovingian/daemon/multiplex-funnel.c
+++ b/tools/merovingian/daemon/multiplex-funnel.c
@@ -105,7 +105,7 @@ MFconnectionManager(void *d)
if (len >= 4 &&
buf[len - 3] ==
'*' && buf[len - 4] == '/')
buf[len - 2] = '\0';
- if (glob(buf, msg + 1) == 1) {
+ if (db_glob(buf, msg + 1) == 1)
{
sabdb *stats;
Mapi tm = NULL;
/* match! eat away
trailing / (for matching) */
@@ -154,7 +154,7 @@ MFconnectionManager(void *d)
if (len >= 4 &&
buf[len - 3] ==
'*' && buf[len - 4] == '/')
buf[len - 2] = '\0';
- if (glob(buf, msg + 1) == 1) {
+ if (db_glob(buf, msg + 1) == 1)
{
/* reevaluate, to see
if connection is still
* available */
sabdb *walk;
diff --git a/tools/merovingian/utils/glob.c b/tools/merovingian/utils/glob.c
--- a/tools/merovingian/utils/glob.c
+++ b/tools/merovingian/utils/glob.c
@@ -22,7 +22,7 @@
* Returns if haystack matches expr, using tag globbing.
*/
char
-glob(const char *expr, const char *haystack)
+db_glob(const char *expr, const char *haystack)
{
const char *haymem = NULL;
const char *exprmem = NULL;
@@ -73,7 +73,7 @@ glob(const char *expr, const char *hayst
default:
if (*expr != *haystack) {
if (haymem != NULL) {
- return(glob(exprmem, haymem));
+ return(db_glob(exprmem,
haymem));
} else {
return(0);
}
diff --git a/tools/merovingian/utils/glob.h b/tools/merovingian/utils/glob.h
--- a/tools/merovingian/utils/glob.h
+++ b/tools/merovingian/utils/glob.h
@@ -9,7 +9,7 @@
#ifndef _SEEN_GLOB_H
#define _SEEN_GLOB_H 1
-char glob(const char *expr, const char *haystack);
+char db_glob(const char *expr, const char *haystack);
#endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
