cli-nolock.patch revision 919
851N/A# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
851N/A# Use is subject to license terms.
98N/A#
98N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A# and/or sell copies of the Software, and to permit persons to whom the
919N/A# Software is furnished to do so, subject to the following conditions:
919N/A#
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
919N/A# Software.
919N/A#
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
919N/A# DEALINGS IN THE SOFTWARE.
194N/Adiff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
851N/A--- os/utils.c 2009-09-07 23:04:53.000000000 -0700
851N/A+++ os/utils.c 2009-11-03 22:28:49.970963082 -0800
851N/A@@ -504,9 +504,11 @@ void UseMsg(void)
98N/A #ifdef RLIMIT_STACK
98N/A ErrorF("-ls int limit stack space to N Kb\n");
98N/A #endif
98N/A+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */
98N/A #ifdef SERVER_LOCK
98N/A ErrorF("-nolock disable the locking mechanism\n");
98N/A #endif
98N/A+#endif
98N/A #ifndef NOLOGOHACK
98N/A ErrorF("-logo enable logo in screen saver\n");
98N/A ErrorF("nologo disable logo in screen saver\n");
851N/A@@ -758,6 +760,7 @@ ProcessCommandLine(int argc, char *argv[
98N/A UseMsg();
98N/A }
98N/A #endif
98N/A+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */
98N/A #ifdef SERVER_LOCK
98N/A else if ( strcmp ( argv[i], "-nolock") == 0)
98N/A {
851N/A@@ -769,6 +772,7 @@ ProcessCommandLine(int argc, char *argv[
98N/A nolock = TRUE;
98N/A }
98N/A #endif
98N/A+#endif
98N/A #ifndef NOLOGOHACK
98N/A else if ( strcmp( argv[i], "-logo") == 0)
98N/A {