Differences From Artifact [67de4bd6ca]:

• File generic/tclIOUtil.c — part of check-in [349a10088f] at 2006-08-29 00:36:57 on branch trunk — fixed [ 1548263 ] NULL return from Tcl_FSGetNormalizedPath segv (user: coldstore size: 138686)

To Artifact [c2b682e3db]:

• File generic/tclIOUtil.c — part of check-in [65113c21ec] at 2006-10-31 20:19:43 on branch trunk — * generic/tclBasic.c: Refactored and renamed the routines * generic/tclCkalloc.c: TclObjPrintf, TclFormatObj, and * generic/tclCmdAH.c: TclFormatToErrorInfo to a new set of * generic/tclCmdIL.c: routines TclAppendPrintfToObj, * generic/tclCmdMZ.c: TclAppendFormatToObj, TclObjPrintf, and * generic/tclDictObj.c: TclObjFormat, with the intent of making * generic/tclExecute.c: the latter list, plus TclAppendLimitedToObj * generic/tclIORChan.c: and TclAppendObjToErrorInfo, public via * generic/tclIOUtil.c: a revised TIP 270. * generic/tclInt.h: * generic/tclMain.c: * generic/tclNamesp.c: * generic/tclParseExpr.c: * generic/tclPkg.c: * generic/tclProc.c: * generic/tclStringObj.c: * generic/tclTimer.c: * generic/tclUtil.c: * unix/tclUnixFCmd.c: (user: dgp size: 138705)

13
14
15
16
17
18
19
20

21
22
23
24
25
26
27

13
14
15
16
17
18
19

20
21
22
23
24
25
26
27

-
+

 * Copyright (c) 1991-1994 The Regents of the University of California.
 * Copyright (c) 1994-1997 Sun Microsystems, Inc.
 * Copyright (c) 2001-2004 Vincent Darley.
 *
 * See the file "license.terms" for information on usage and redistribution of
 * this file, and for a DISCLAIMER OF ALL WARRANTIES.
 *
 * RCS: @(#) $Id: tclIOUtil.c,v 1.134 2006/08/29 00:36:57 coldstore Exp $
 * RCS: @(#) $Id: tclIOUtil.c,v 1.135 2006/10/31 20:19:45 dgp Exp $
 */

#include "tclInt.h"
#ifdef __WIN32__
#   include "tclWinInt.h"
#endif
#include "tclFileSystem.h"

1826
1827
1828
1829
1830
1831
1832

1833

1834
1835

1836
1837
1838
1839
1840
1841
1842

1826
1827
1828
1829
1830
1831
1832
1833

1834
1835

1836
1837
1838
1839
1840
1841
1842
1843

+
-
+

-
+

	 * Record information telling where the error occurred.
	 */

	CONST char *pathString = Tcl_GetStringFromObj(pathPtr, &length);
	int limit = 150;
	int overflow = (length > limit);

	TclAppendObjToErrorInfo(interp, TclObjPrintf(NULL,
	TclFormatToErrorInfo(interp, "\n    (file \"%.*s%s\" line %d)",
		"\n    (file \"%.*s%s\" line %d)",
		(overflow ? limit : length), pathString,
		(overflow ? "..." : ""), interp->errorLine);
		(overflow ? "..." : ""), interp->errorLine));
    }

  end:
    Tcl_DecrRefCount(objPtr);
    return result;
}