aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tcl_setup.c83
-rw-r--r--tclpd.c83
2 files changed, 83 insertions, 83 deletions
diff --git a/tcl_setup.c b/tcl_setup.c
deleted file mode 100644
index 72ffa90..0000000
--- a/tcl_setup.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "tcl_extras.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
-
-Tcl_Interp *tcl_for_pd = NULL;
-
-extern void tcl_setup(void) {
- tclpd_setup();
-}
-
-void tclpd_setup(void) {
- if(tcl_for_pd) {
- return;
- }
-
- post("Tcl loader v" TCLPD_VERSION);
-
- proxyinlet_setup();
-
- tcl_for_pd = Tcl_CreateInterp();
- Tcl_Init(tcl_for_pd);
- Tclpd_SafeInit(tcl_for_pd);
-
- char *dirname = (char*)malloc(PATH_MAX);
- char *dirresult = (char*)malloc(PATH_MAX);
- /* nameresult is only a pointer in dirresult space so don't delete[] it. */
- char *nameresult;
- if(getcwd(dirname, PATH_MAX) < 0) {
- post("Tcl loader: FATAL: cannot get current dir");
- /* exit(69); */ return;
- }
-
- int fd = open_via_path(dirname, "tcl", PDSUF, dirresult, &nameresult, PATH_MAX, 1);
- if(fd >= 0) {
- close(fd);
- } else {
- post("Tcl loader: %s was not found via the -path!", "tcl" PDSUF);
- }
-
- Tcl_SetVar(tcl_for_pd, "TCLPD_DIR", dirresult, 0);
- Tcl_Eval(tcl_for_pd, "package provide Tclpd " TCLPD_VERSION);
-
- if(Tcl_Eval(tcl_for_pd, "source $TCLPD_DIR/pkgIndex.tcl") != TCL_OK) {
- post("Tcl loader: error loading %s/pkgIndex.tcl", dirresult);
- }
-
- if(Tcl_Eval(tcl_for_pd, "source $TCLPD_DIR/tcl.tcl") == TCL_OK) {
- post("Tcl loader: loaded %s/tcl.tcl", dirresult);
- }
-
- if(Tcl_Eval(tcl_for_pd,"source $env(HOME)/.pd.tcl") == TCL_OK) {
- post("Tcl loader: loaded ~/.pd.tcl");
- }
-
- free(dirresult);
- free(dirname);
-
- sys_register_loader(tclpd_do_load_lib);
-}
-
-void tclpd_interp_error(int result) {
- post("Tcl error: %s", Tcl_GetStringResult(tcl_for_pd));
- post(" (see stderr for details)");
-
- fprintf(stderr, "------------------- Tcl error: -------------------\n");
-
- // Tcl_GetReturnOptions and Tcl_DictObjGet only available in Tcl >= 8.5
-
-#if ((TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5) || (TCL_MAJOR_VERSION > 8))
- Tcl_Obj* dict = Tcl_GetReturnOptions(tcl_for_pd, result);
- Tcl_Obj* errorInfo = NULL;
- Tcl_Obj* errorInfoK = Tcl_NewStringObj("-errorinfo", -1);
- Tcl_IncrRefCount(errorInfoK);
- Tcl_DictObjGet(tcl_for_pd, dict, errorInfoK, &errorInfo);
- Tcl_DecrRefCount(errorInfoK);
- fprintf(stderr, "%s\n", Tcl_GetStringFromObj(errorInfo, 0));
-#else
- fprintf(stderr, "Backtrace not available in Tcl < 8.5. Please upgrade Tcl.\n");
-#endif
-
- fprintf(stderr, "--------------------------------------------------\n");
-}
diff --git a/tclpd.c b/tclpd.c
index e69de29..72ffa90 100644
--- a/tclpd.c
+++ b/tclpd.c
@@ -0,0 +1,83 @@
+#include "tcl_extras.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <limits.h>
+
+Tcl_Interp *tcl_for_pd = NULL;
+
+extern void tcl_setup(void) {
+ tclpd_setup();
+}
+
+void tclpd_setup(void) {
+ if(tcl_for_pd) {
+ return;
+ }
+
+ post("Tcl loader v" TCLPD_VERSION);
+
+ proxyinlet_setup();
+
+ tcl_for_pd = Tcl_CreateInterp();
+ Tcl_Init(tcl_for_pd);
+ Tclpd_SafeInit(tcl_for_pd);
+
+ char *dirname = (char*)malloc(PATH_MAX);
+ char *dirresult = (char*)malloc(PATH_MAX);
+ /* nameresult is only a pointer in dirresult space so don't delete[] it. */
+ char *nameresult;
+ if(getcwd(dirname, PATH_MAX) < 0) {
+ post("Tcl loader: FATAL: cannot get current dir");
+ /* exit(69); */ return;
+ }
+
+ int fd = open_via_path(dirname, "tcl", PDSUF, dirresult, &nameresult, PATH_MAX, 1);
+ if(fd >= 0) {
+ close(fd);
+ } else {
+ post("Tcl loader: %s was not found via the -path!", "tcl" PDSUF);
+ }
+
+ Tcl_SetVar(tcl_for_pd, "TCLPD_DIR", dirresult, 0);
+ Tcl_Eval(tcl_for_pd, "package provide Tclpd " TCLPD_VERSION);
+
+ if(Tcl_Eval(tcl_for_pd, "source $TCLPD_DIR/pkgIndex.tcl") != TCL_OK) {
+ post("Tcl loader: error loading %s/pkgIndex.tcl", dirresult);
+ }
+
+ if(Tcl_Eval(tcl_for_pd, "source $TCLPD_DIR/tcl.tcl") == TCL_OK) {
+ post("Tcl loader: loaded %s/tcl.tcl", dirresult);
+ }
+
+ if(Tcl_Eval(tcl_for_pd,"source $env(HOME)/.pd.tcl") == TCL_OK) {
+ post("Tcl loader: loaded ~/.pd.tcl");
+ }
+
+ free(dirresult);
+ free(dirname);
+
+ sys_register_loader(tclpd_do_load_lib);
+}
+
+void tclpd_interp_error(int result) {
+ post("Tcl error: %s", Tcl_GetStringResult(tcl_for_pd));
+ post(" (see stderr for details)");
+
+ fprintf(stderr, "------------------- Tcl error: -------------------\n");
+
+ // Tcl_GetReturnOptions and Tcl_DictObjGet only available in Tcl >= 8.5
+
+#if ((TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5) || (TCL_MAJOR_VERSION > 8))
+ Tcl_Obj* dict = Tcl_GetReturnOptions(tcl_for_pd, result);
+ Tcl_Obj* errorInfo = NULL;
+ Tcl_Obj* errorInfoK = Tcl_NewStringObj("-errorinfo", -1);
+ Tcl_IncrRefCount(errorInfoK);
+ Tcl_DictObjGet(tcl_for_pd, dict, errorInfoK, &errorInfo);
+ Tcl_DecrRefCount(errorInfoK);
+ fprintf(stderr, "%s\n", Tcl_GetStringFromObj(errorInfo, 0));
+#else
+ fprintf(stderr, "Backtrace not available in Tcl < 8.5. Please upgrade Tcl.\n");
+#endif
+
+ fprintf(stderr, "--------------------------------------------------\n");
+}