Changeset: bc35e7c947c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc35e7c947c7
Modified Files:
clients/mapiclient/mclient.c
Branch: default
Log Message:
mclient: drop -T language hack, use -l now
diffs (44 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2547,7 +2547,6 @@
{"input", 1, 0, 'I'},
{"interactive", 0, 0, 'i'},
{"language", 1, 0, 'l'},
- {"taal", 1, 0, 'T'},
{"log", 1, 0, 'L'},
{"null", 1, 0, 'n'},
#ifdef HAVE_POPEN
@@ -2634,7 +2633,7 @@
q = NULL;
} else if (strcmp(buf, "language") == 0) {
language = strdup(q); /* leak */
- if (strcmp(language, "sql") == 0) {
+ if (strstr(language, "sql") == language) {
mode = SQL;
q = NULL;
} else if (strcmp(language, "mal") == 0) {
@@ -2716,8 +2715,9 @@
case 'l':
/* accept unambiguous prefix of language */
if (strcmp(optarg, "sql") == 0 ||
- strcmp(optarg, "sq") == 0 || strcmp(optarg, "s") ==
0) {
- language = "sql";
+ strcmp(optarg, "sq") == 0 || strcmp(optarg, "s") ==
0 ||
+ strstr(optarg, "sql") == optarg) {
+ language = optarg;
mode = SQL;
} else if (strcmp(optarg, "mil") == 0 ||
strcmp(optarg, "mi") == 0) {
@@ -2743,11 +2743,6 @@
exit(-1);
}
break;
- case 'T':
- /* mere hack */
- mode = SQL;
- language = optarg;
- break;
case 'n':
nullstring = optarg;
break;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
