From dbd6cede000d76a4da64732989ebc219a3e7d612 Mon Sep 17 00:00:00 2001 From: oharboe Date: Sun, 20 Jul 2008 17:06:30 +0000 Subject: [PATCH] Duane Ellis improve error message in Jim when sourcing a file fails. Previously it did not tell you the CWD Jim was using as its reference point. (Helpful when script filenames are a relative path) git-svn-id: svn://svn.berlios.de/openocd/trunk@840 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/jim.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/helper/jim.c b/src/helper/jim.c index c1434dbb0..32eb67594 100644 --- a/src/helper/jim.c +++ b/src/helper/jim.c @@ -8734,12 +8734,15 @@ int Jim_EvalFile(Jim_Interp *interp, const char *filename) int nread, totread, maxlen, buflen; int retval; Jim_Obj *scriptObjPtr; + char cwd[ 2048 ]; if ((fp = fopen(filename, "r")) == NULL) { Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + getcwd( cwd, sizeof(cwd) ); Jim_AppendStrings(interp, Jim_GetResult(interp), - "Error loading script \"", filename, "\": ", - strerror(errno), NULL); + "Error loading script \"", filename, "\"", + " cwd: ", cwd, + " err: ", strerror(errno), NULL); return JIM_ERR; } buflen = 1024;