* doc/FileSystem.3: Implementation of

        * doc/source.n:                                 TIPs 137/151.  Adds
        * doc/tclsh.1:                                  a -encoding option to
        * generic/tcl.decls:                            the [source] command
        * generic/tclCmdMZ.c (Tcl_SourceObjCmd):        and a new C routine,
        * generic/tclIOUtil.c (Tcl_FSEvalFileEx):       Tcl_FSEvalFileEx(),
        * generic/tclMain.c (Tcl_Main):                 that provides C access
        * mac/tclMacResource.c (Tcl_MacSourceObjCmd):   to the same function.
        * tests/cmdMZ.test:                             Also adds command line
        * tests/main.test:      option handling in Tcl_Main() so that tclsh
        * tests/source.test:    and other apps built on Tcl_Main() respect
        a -encoding command line option before a script filename.  Docs and
        tests updated as well.  [Patch 742683]
        This is a ***POTENTIAL INCOMPATIBILITY*** only for those C programs
        that embed Tcl, build on Tcl_Main(), and make use of Tcl_Main's former
        ability to pass a leading "-encoding" option to interactive shell
        operations.

        * generic/tclInt.decls:                         Added internal stub
        * generic/tclMain.c (Tcl*StartupScript*):       table entries for
        two new functions Tcl_SetStartupScript() and Tcl_GetStartupScript()
        that set/get the path and encoding for the startup script to be
        evaluated by either Tcl_Main() or Tk_Main().  Given public names in
        anticipation of their exposure by a followup TIP.

        * generic/tclDecls.h:           make genstubs
        * generic/tclIntDecls.h:
        * generic/tclStubInit.c:

1 files changed, 67 insertions, 1 deletions

diff --git a/tests/main.test b/tests/main.test
index 6778b88..605bab8 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -1,6 +1,6 @@
 # This file contains a collection of tests for generic/tclMain.c.
 #
-# RCS: @(#) $Id: main.test,v 1.13 2003/02/16 01:36:32 msofer Exp $
+# RCS: @(#) $Id: main.test,v 1.14 2003/09/05 21:52:12 dgp Exp $
 
 if {[catch {package require tcltest 2.0.2}]} {
     puts stderr "Skipping tests in [info script]. tcltest 2.0.2 required."
@@ -139,6 +139,72 @@ namespace eval ::tcl::test::main {
     } -result [list [list [encoding convertfrom [encoding system] \
 	[encoding convertto [encoding system] \u20ac]]] {} 0]\n
 
+    test Tcl_Main-1.7 {
+	Tcl_Main: startup script - -encoding option
+    } -constraints {
+	stdio
+    } -setup {
+	set script [makeFile {} script]
+	removeFile script
+	set f [open $script w]
+	fconfigure $f -encoding utf-8
+	puts $f {puts [list $argv0 $argv $tcl_interactive]}
+	puts -nonewline $f {puts [string equal \u20ac }
+	puts $f "\u20ac]"
+	close $f
+	catch {set f [open "|[list [interpreter] -encoding utf-8 script]" r]}
+    } -body {
+	read $f
+    } -cleanup {
+	close $f
+	removeFile script
+    } -result [list script {} 0]\n1\n
+
+    test Tcl_Main-1.8 {
+	Tcl_Main: startup script - -encoding option - mismatched encodings
+    } -constraints {
+	stdio
+    } -setup {
+	set script [makeFile {} script]
+	removeFile script
+	set f [open $script w]
+	fconfigure $f -encoding utf-8
+	puts $f {puts [list $argv0 $argv $tcl_interactive]}
+	puts -nonewline $f {puts [string equal \u20ac }
+	puts $f "\u20ac]"
+	close $f
+	catch {set f [open "|[list [interpreter] -encoding ascii script]" r]}
+    } -body {
+	read $f
+    } -cleanup {
+	close $f
+	removeFile script
+    } -result [list script {} 0]\n0\n
+
+    test Tcl_Main-1.9 {
+	Tcl_Main: startup script - -encoding option - no abbrevation
+    } -constraints {
+	stdio
+    } -setup {
+	set script [makeFile {} script]
+	removeFile script
+	set f [open $script w]
+	fconfigure $f -encoding utf-8
+	puts $f {puts [list $argv0 $argv $tcl_interactive]}
+	puts -nonewline $f {puts [string equal \u20ac }
+	puts $f "\u20ac]"
+	close $f
+	catch {set f [open "|[list [interpreter] -enc utf-8 script]" r+]}
+    } -body {
+	type $f {
+	    puts $argv
+	}
+	list [catch {gets $f} line] $line
+    } -cleanup {
+	close $f
+	removeFile script
+    } -result {0 {-enc utf-8 script}}
+
     # Tests Tcl_Main-2.*: application-initialization procedure
 
     test Tcl_Main-2.1 {