You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2007/01/11 13:41:59 UTC
svn commit: r495209 -
/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
Author: tellison
Date: Thu Jan 11 04:41:55 2007
New Revision: 495209
URL: http://svn.apache.org/viewvc?view=rev&rev=495209
Log:
Make the installation of the launcher's signal hander optional, and off by default.
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c?view=diff&rev=495209&r1=495208&r2=495209
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c Thu Jan 11 04:41:55 2007
@@ -102,15 +102,19 @@
options.envp = envp;
options.portLibrary = &hyportLibrary;
- if (hyportLibrary.sig_protect (&hyportLibrary,
- signalProtectedMain, &options,
- genericSignalHandler, NULL,
- HYPORT_SIG_FLAG_SIGALLSYNC,
- &result) == 0)
- {
- rc = result;
- }
-
+ if (hyportLibrary.sysinfo_get_env(&hyportLibrary, "HARMONY_INSTALL_SIG_HANDLER", NULL, 0) == -1) {
+ rc = gpProtectedMain (&options);
+ } else {
+ if (hyportLibrary.sig_protect (&hyportLibrary,
+ signalProtectedMain,
+ &options,
+ genericSignalHandler,
+ NULL,
+ HYPORT_SIG_FLAG_SIGALLSYNC,
+ &result) == 0) {
+ rc = result;
+ }
+ }
hyportLibrary.port_shutdown_library (&hyportLibrary);
}