cli-nolock.patch revision 98
98N/A# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
98N/A# Use subject to license terms.
98N/A#
98N/A# Permission is hereby granted, free of charge, to any person obtaining a
98N/A# copy of this software and associated documentation files (the
98N/A# "Software"), to deal in the Software without restriction, including
98N/A# without limitation the rights to use, copy, modify, merge, publish,
98N/A# distribute, and/or sell copies of the Software, and to permit persons
98N/A# to whom the Software is furnished to do so, provided that the above
98N/A# copyright notice(s) and this permission notice appear in all copies of
98N/A# the Software and that both the above copyright notice(s) and this
98N/A# permission notice appear in supporting documentation.
98N/A#
98N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
98N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
98N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
98N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
98N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
98N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
98N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
98N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
98N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
98N/A#
98N/A# Except as contained in this notice, the name of a copyright holder
98N/A# shall not be used in advertising or otherwise to promote the sale, use
98N/A# or other dealings in this Software without prior written authorization
98N/A# of the copyright holder.
98N/A
98N/A
98N/Adiff -urp -x '*~' os/utils.c os/utils.c
98N/A--- os/utils.c 2006-12-21 10:50:47.000000000 -0800
98N/A+++ os/utils.c 2006-12-21 14:20:53.648154000 -0800
98N/A@@ -630,9 +630,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");
98N/A@@ -914,6 +916,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 {
98N/A@@ -925,6 +928,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 {