diff options
Diffstat (limited to 'win/tclAppInit.c')
| -rw-r--r-- | win/tclAppInit.c | 159 |
1 files changed, 88 insertions, 71 deletions
diff --git a/win/tclAppInit.c b/win/tclAppInit.c index b7bcc30..6b20dce 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -2,16 +2,16 @@ * tclAppInit.c -- * * Provides a default version of the main program and Tcl_AppInit - * procedure for Tcl applications (without Tk). Note that this - * program must be built in Win32 console mode to work properly. + * function for Tcl applications (without Tk). Note that this program + * must be built in Win32 console mode to work properly. * * Copyright (c) 1996-1997 by Sun Microsystems, Inc. * Copyright (c) 1998-1999 by Scriptics Corporation. * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + * See the file "license.terms" for information on usage and redistribution of + * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclAppInit.c,v 1.21 2004/10/28 04:53:42 davygrvy Exp $ + * RCS: @(#) $Id: tclAppInit.c,v 1.22 2005/07/24 22:56:45 dkf Exp $ */ #include "tcl.h" @@ -26,14 +26,14 @@ extern Tcl_PackageInitProc TclObjTest_Init; #endif /* TCL_TEST */ #if defined(__GNUC__) -static void setargv _ANSI_ARGS_((int *argcPtr, char ***argvPtr)); +static void setargv(int *argcPtr, char ***argvPtr); #endif /* __GNUC__ */ -static BOOL WINAPI sigHandler (DWORD fdwCtrlType); +static BOOL WINAPI sigHandler(DWORD fdwCtrlType); static Tcl_AsyncProc asyncExit; static void AppInitExitHandler(ClientData clientData); static Tcl_AsyncHandler exitToken = NULL; -static DWORD exitErrorCode = 0; +static DWORD exitErrorCode = 0; /* @@ -44,8 +44,8 @@ static DWORD exitErrorCode = 0; * This is the main program for the application. * * Results: - * None: Tcl_Main never returns here, so this procedure never - * returns either. + * None: Tcl_Main never returns here, so this function never returns + * either. * * Side effects: * Whatever the application does. @@ -54,13 +54,13 @@ static DWORD exitErrorCode = 0; */ int -main (int argc, char *argv[]) +main(int argc, char *argv[]) { /* - * The following #if block allows you to change the AppInit - * function by using a #define of TCL_LOCAL_APPINIT instead - * of rewriting this entire file. The #if checks for that - * #define and uses Tcl_AppInit if it doesn't exist. + * The following #if block allows you to change the AppInit function by + * using a #define of TCL_LOCAL_APPINIT instead of rewriting this entire + * file. The #if checks for that #define and uses Tcl_AppInit if it + * doesn't exist. */ #ifndef TCL_LOCAL_APPINIT @@ -81,8 +81,8 @@ main (int argc, char *argv[]) char *p; /* - * Set up the default locale to be standard "C" locale so parsing - * is performed correctly. + * Set up the default locale to be standard "C" locale so parsing is + * performed correctly. */ #if defined(__GNUC__) @@ -114,13 +114,13 @@ main (int argc, char *argv[]) * * Tcl_AppInit -- * - * This procedure performs application-specific initialization. - * Most applications, especially those that incorporate additional - * packages, will have their own version of this procedure. + * This function performs application-specific initialization. Most + * applications, especially those that incorporate additional packages, + * will have their own version of this function. * * Results: - * Returns a standard Tcl completion code, and leaves an error - * message in the interp's result if an error occurs. + * Returns a standard Tcl completion code, and leaves an error message in + * the interp's result if an error occurs. * * Side effects: * Depends on the startup script. @@ -139,13 +139,15 @@ Tcl_AppInit(interp) /* * Install a signal handler to the win32 console tclsh is running in. */ + SetConsoleCtrlHandler(sigHandler, TRUE); exitToken = Tcl_AsyncCreate(asyncExit, NULL); /* - * This exit handler will be used to free the - * resources allocated in this file. + * This exit handler will be used to free the resources allocated in this + * file. */ + Tcl_CreateExitHandler(AppInitExitHandler, NULL); #ifdef TCL_TEST @@ -160,7 +162,7 @@ Tcl_AppInit(interp) return TCL_ERROR; } Tcl_StaticPackage(interp, "procbodytest", Procbodytest_Init, - Procbodytest_SafeInit); + Procbodytest_SafeInit); #endif /* TCL_TEST */ #if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES @@ -182,8 +184,8 @@ Tcl_AppInit(interp) #endif /* - * Call the init procedures for included packages. Each call should - * look like this: + * Call the init functions for included packages. Each call should look + * like this: * * if (Mod_Init(interp) == TCL_ERROR) { * return TCL_ERROR; @@ -193,15 +195,15 @@ Tcl_AppInit(interp) */ /* - * Call Tcl_CreateCommand for application-specific commands, if - * they weren't already created by the init procedures called above. + * Call Tcl_CreateCommand for application-specific commands, if they + * weren't already created by the init functions called above. */ /* - * Specify a user-specific startup file to invoke if the application - * is run interactively. Typically the startup file is "~/.apprc" - * where "app" is the name of the application. If this line is deleted - * then no user-specific startup file will be run under any conditions. + * Specify a user-specific startup file to invoke if the application is + * run interactively. Typically the startup file is "~/.apprc" where "app" + * is the name of the application. If this line is deleted then no + * user-specific startup file will be run under any conditions. */ Tcl_SetVar(interp, "tcl_rcFileName", "~/tclshrc.tcl", TCL_GLOBAL_ONLY); @@ -213,8 +215,8 @@ Tcl_AppInit(interp) * * AppInitExitHandler -- * - * This function is called to cleanup the app init resources before - * Tcl is unloaded. + * This function is called to cleanup the app init resources before Tcl + * is unloaded. * * Results: * None. @@ -230,12 +232,13 @@ AppInitExitHandler( ClientData clientData) /* Not Used. */ { if (exitToken != NULL) { - /* - * This should be safe to do even if we - * are in an async exit right now. - */ - Tcl_AsyncDelete(exitToken); - exitToken = NULL; + /* + * This should be safe to do even if we are in an async exit right + * now. + */ + + Tcl_AsyncDelete(exitToken); + exitToken = NULL; } } @@ -244,10 +247,10 @@ AppInitExitHandler( * * setargv -- * - * Parse the Windows command line string into argc/argv. Done here - * because we don't trust the builtin argument parser in crt0. - * Windows applications are responsible for breaking their command - * line into arguments. + * Parse the Windows command line string into argc/argv. Done here + * because we don't trust the builtin argument parser in crt0. Windows + * applications are responsible for breaking their command line into + * arguments. * * 2N backslashes + quote -> N backslashes + begin quoted string * 2N + 1 backslashes + quote -> literal @@ -257,8 +260,8 @@ AppInitExitHandler( * quote -> begin quoted string * * Results: - * Fills argcPtr with the number of arguments and argvPtr with the - * array of arguments. + * Fills argcPtr with the number of arguments and argvPtr with the array + * of arguments. * * Side effects: * Memory allocated. @@ -279,8 +282,8 @@ setargv(argcPtr, argvPtr) cmdLine = GetCommandLine(); /* INTL: BUG */ /* - * Precompute an overly pessimistic guess at the number of arguments - * in the command line by counting non-space spans. + * Precompute an overly pessimistic guess at the number of arguments in + * the command line by counting non-space spans. */ size = 2; @@ -328,18 +331,18 @@ setargv(argcPtr, argvPtr) } else { inquote = !inquote; } - } - slashes >>= 1; - } + } + slashes >>= 1; + } - while (slashes) { + while (slashes) { *arg = '\\'; arg++; slashes--; } - if ((*p == '\0') - || (!inquote && ((*p == ' ') || (*p == '\t')))) { /* INTL: ISO space. */ + if ((*p == '\0') || (!inquote && + ((*p == ' ') || (*p == '\t')))) { /* INTL: ISO space. */ break; } if (copy != 0) { @@ -347,7 +350,7 @@ setargv(argcPtr, argvPtr) arg++; } p++; - } + } *arg = '\0'; argSpace = arg + 1; } @@ -375,7 +378,7 @@ setargv(argcPtr, argvPtr) */ int -asyncExit ( +asyncExit( ClientData clientData, /* Not Used. */ Tcl_Interp *interp, /* interp in context, if any. */ int code) /* result of last command, if any. */ @@ -391,17 +394,17 @@ asyncExit ( * * sigHandler -- * - * Signal handler for the Win32 OS. Catches Ctrl+C, Ctrl+Break and - * other exits. This is needed so tclsh can do it's real clean-up - * and not an unclean crash terminate. + * Signal handler for the Win32 OS. Catches Ctrl+C, Ctrl+Break and other + * exits. This is needed so tclsh can do it's real clean-up and not an + * unclean crash terminate. * * Results: * TRUE. * * Side effects: - * Effects the way the app exits from a signal. This is an - * operating system supplied thread and unsafe to call ANY - * Tcl commands except for Tcl_AsyncMark. + * Effects the way the app exits from a signal. This is an operating + * system supplied thread and unsafe to call ANY Tcl commands except for + * Tcl_AsyncMark. * *---------------------------------------------------------------------- */ @@ -413,28 +416,42 @@ sigHandler( HANDLE hStdIn; if (!exitToken) { - /* Async token must have been destroyed, punt gracefully. */ + /* + * Async token must have been destroyed, punt gracefully. + */ return FALSE; } /* - * If Tcl is currently executing some bytecode or in the eventloop, - * this will cause Tcl to enter asyncExit at the next command - * boundry. + * If Tcl is currently executing some bytecode or in the eventloop, this + * will cause Tcl to enter asyncExit at the next command boundry. */ + exitErrorCode = fdwCtrlType; Tcl_AsyncMark(exitToken); /* - * This will cause Tcl_Gets in Tcl_Main() to drop-out with an <EOF> - * should it be blocked on input and our Tcl_AsyncMark didn't grab - * the attention of the interpreter. + * This will cause Tcl_Gets in Tcl_Main() to drop-out with an <EOF> should + * it be blocked on input and our Tcl_AsyncMark didn't grab the attention + * of the interpreter. */ + hStdIn = GetStdHandle(STD_INPUT_HANDLE); if (hStdIn) { CloseHandle(hStdIn); } - /* indicate to the OS not to call the default terminator. */ + /* + * Indicate to the OS not to call the default terminator. + */ + return TRUE; } + +/* + * Local Variables: + * mode: c + * c-basic-offset: 4 + * fill-column: 78 + * End: + */ |