* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Log: wtcl.c,v $
- * Revision 1.8 1995/11/06 17:44:23 adam
+ * Revision 1.12 1996/03/07 12:45:34 adam
+ * New Tcl calls egw_enc/egw_dec to encode/decode binary URL info.
+ *
+ * Revision 1.11 1996/01/24 08:26:56 adam
+ * All tcl commands prefixed with egw_ (except the html command).
+ *
+ * Revision 1.10 1995/11/08 16:14:35 adam
+ * Many improvements and bug fixes.
+ * First version that ran on dtbsun.
+ *
+ * Revision 1.9 1995/11/07 14:57:00 adam
+ * Work on search in multiple targets.
+ * New wtcl command: wlog.
+ * Optional timeout parameter to zwait.
+ *
+ * Revision 1.8 1995/11/06 17:44:23 adam
* State reestablised when shell restarts. History of previous
* result sets.
*
int i;
for (i = 1; i<argc; i++)
- wo_puts (p->wcl, argv[i]);
+ wo_write (p->wcl, argv[i], strlen(argv[i]));
return TCL_OK;
}
-static int proc_htmlr_invoke (ClientData clientData, Tcl_Interp *interp,
- int argc, char **argv)
-{
- struct tcl_info *p = (struct tcl_info*) clientData;
- int r;
-
- r = proc_html_invoke (clientData, interp, argc, argv);
- wo_putc (p->wcl, '\n');
- return r;
-}
-
static int proc_wform_invoke (ClientData clientData, Tcl_Interp *interp,
int argc, char **argv)
{
return TCL_OK;
}
+static int proc_wlog_invoke (ClientData clientData, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ unsigned mask;
+
+ if (argc < 3)
+ return TCL_OK;
+ if (!strcmp (argv[1], "debug"))
+ mask = GW_LOG_DEBUG;
+ else if (!strcmp (argv[1], "fatal"))
+ mask = GW_LOG_FATAL;
+ else if (!strcmp (argv[1], "warn"))
+ mask = GW_LOG_WARN;
+ else if (!strcmp (argv[1], "acct"))
+ mask = GW_LOG_ACCT;
+ else
+ mask = GW_LOG_DEBUG;
+ switch (argc)
+ {
+ case 3:
+ gw_log (mask, mod, "%s", argv[2]);
+ break;
+ case 4:
+ gw_log (mask, mod, "%s %s", argv[2], argv[3]);
+ break;
+ case 5:
+ gw_log (mask, mod, "%s %s %s", argv[2], argv[3], argv[4]);
+ break;
+ case 6:
+ gw_log (mask, mod, "%s %s %s %s", argv[2], argv[3], argv[4], argv[5]);
+ break;
+ }
+ return TCL_OK;
+}
+
+static int proc_enc (ClientData clientData, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ int i;
+ char buf1[4];
+ char buf2[2];
+
+ buf1[0] = '%';
+ buf2[1] = '\0';
+ for (i = 1; i<argc; i++)
+ {
+ const char *cp = argv[i];
+ while (*cp)
+ {
+ if (*cp <= ' ' || *cp >= 127 || *cp == '/' || *cp == ' ' ||
+ *cp == '&' || *cp == ':' || *cp == '%')
+ {
+ sprintf (buf1+1, "%02X", *cp);
+ Tcl_AppendResult (interp, buf1, NULL);
+ }
+ else
+ {
+ buf2[0] = *cp;
+ Tcl_AppendResult (interp, buf2, NULL);
+ }
+ cp++;
+ }
+ }
+ return TCL_OK;
+}
+
+static int proc_dec (ClientData clientData, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ int i;
+ unsigned val;
+ char buf[2];
+
+ buf[1] = '\0';
+ for (i = 1; i<argc; i++)
+ {
+ const char *cp = argv[i];
+ while (*cp)
+ {
+ if (*cp == '%' && cp[1] && cp[2])
+ {
+ if (cp[1] >= 'A')
+ val = cp[1] - 'A'+10;
+ else
+ val = cp[1] - '0';
+
+
+ if (cp[2] >= 'A')
+ val = val*16 + (cp[2] - 'A'+10);
+ else
+ val = val*16 + (cp[2] - '0');
+ buf[0] = val;
+ cp += 3;
+ }
+ else
+ buf[0] = *cp++;
+ Tcl_AppendResult (interp, buf, NULL);
+ }
+ }
+ return TCL_OK;
+}
+
+
int Tcl_AppInit (Tcl_Interp *interp)
{
if (Tcl_Init (interp) == TCL_ERROR)
}
Tcl_AppInit (p->interp);
Tcl_CreateCommand (p->interp, "html", proc_html_invoke, p, NULL);
- Tcl_CreateCommand (p->interp, "htmlr", proc_htmlr_invoke, p, NULL);
- Tcl_CreateCommand (p->interp, "wform", proc_wform_invoke, p, NULL);
- Tcl_CreateCommand (p->interp, "wabort", proc_wabort_invoke, p, NULL);
- Tcl_CreateCommand (p->interp, "wflush", proc_wflush_invoke, p, NULL);
+ Tcl_CreateCommand (p->interp, "egw_form", proc_wform_invoke, p, NULL);
+ Tcl_CreateCommand (p->interp, "egw_abort", proc_wabort_invoke, p, NULL);
+ Tcl_CreateCommand (p->interp, "egw_flush", proc_wflush_invoke, p, NULL);
+ Tcl_CreateCommand (p->interp, "egw_log", proc_wlog_invoke, p, NULL);
+ Tcl_CreateCommand (p->interp, "egw_enc", proc_enc, p, NULL);
+ Tcl_CreateCommand (p->interp, "egw_dec", proc_dec, p, NULL);
sprintf (tmp_str, "%d", wcl->id);
Tcl_SetVar (p->interp, "sessionId", tmp_str, TCL_GLOBAL_ONLY);
return p;
static void report_error (struct tcl_info *p, int errorLine,
const char *pre, const char *msg)
{
+ if (!msg)
+ msg = "";
gw_log (GW_LOG_WARN, mod, "%s %d %s", pre, errorLine, msg);
wo_printf (p->wcl, "\n<br><hr>\n<strong>"
"%s %d</strong><br>\n", pre, errorLine);
sprintf (fname, "tcl.state.%d", p->wcl->id);
r = Tcl_EvalFile (p->interp, fname);
if (r == TCL_ERROR)
- report_error (p, p->interp->errorLine,
- "Error in Tcl loadState in line",
- Tcl_GetVar (p->interp, "errorInfo", 0));
+ gw_log (GW_LOG_WARN, mod, "Cannot load Tcl state" );
return 0;
}
projects / egate.git / blobdiff