* generic/tclBasic.c (TclAppendObjToErrorInfo): New internal routine

        that appends a Tcl_Obj to the errorInfo, saving the caller the trouble
        of extracting the string rep.

        * generic/tclStringObj.c (TclAppendLimitedToObj):       New internal
        routine that supports truncated appends with optional ellipsis marking.
        This single routine supports UTF-8-safe truncated appends needed in
        several places throughout the Tcl source code, mostly for error and
        stack messages.  Clean fix for [Bug 760872].

        * generic/tclInt.h:     Declarations for new internal routines.

        * generic/tclCmdMZ.c:   Updated callers to use the new routines.
        * generic/tclCompExpr.c:
        * generic/tclCompile.c:
        * generic/tclExecute.c:
        * generic/tclIOUtil.c:
        * generic/tclNamesp.c:
        * generic/tclObj.c:
        * generic/tclParseExpr.c:
        * generic/tclProc.c:
        * generic/tclStringObj.c:
        * mac/tclMacResource.c:

        * library/init.tcl:     Updated ::errorInfo cleanup in [unknown] to
        reflect slight modifications to Tcl_LogCommandInfo().  Corrects
        failing init-4.* tests.

1 files changed, 12 insertions, 6 deletions

diff --git a/mac/tclMacResource.c b/mac/tclMacResource.c
index 52b3587..2403ebf 100644
--- a/mac/tclMacResource.c
+++ b/mac/tclMacResource.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclMacResource.c,v 1.17 2003/10/01 14:33:49 das Exp $
+ * RCS: @(#) $Id: tclMacResource.c,v 1.18 2003/10/14 15:44:53 dgp Exp $
  */
 
 #include <Errors.h>
@@ -1254,7 +1254,6 @@ Tcl_MacEvalResource(
 {
     Handle sourceText;
     Str255 rezName;
-    char msg[200];
     int result, iOpenedResFile = false;
     short saveRef, fileRef = -1;
     char idStr[64];
@@ -1334,10 +1333,17 @@ Tcl_MacEvalResource(
 	if (result == TCL_RETURN) {
 	    result = TCL_OK;
 	} else if (result == TCL_ERROR) {
-	    sprintf(msg, "\n    (rsrc \"%.150s\" line %d)",
-                    resourceName,
-		    interp->errorLine);
-	    Tcl_AddErrorInfo(interp, msg);
+	    Tcl_Obj *errorLine = Tcl_NewIntObj(interp->errorLine);
+	    Tcl_Obj *msg = Tcl_NewStringObj("\n    (rsrc \"", -1);
+	    Tcl_IncrRefCount(errorLine);
+	    Tcl_IncrRefCount(msg);
+	    TclAppendLimitedToObj(msg, resourceName, -1, 150, "");
+	    Tcl_AppendToObj(msg, "\" line ", -1);
+	    Tcl_AppendObjToObj(msg, errorLine);
+	    Tcl_DecrRefCount(errorLine);
+	    Tcl_AppendToObj(msg, ")", -1);
+	    TclAppendObjToErrorInfo(interp, msg);
+	    Tcl_DecrRefCount(msg);
 	}
 				
 	goto rezEvalCleanUp;