0N/A# Copyright 2007 Sun Microsystems, Inc. All rights reserved.

0N/A# Use subject to license terms.

0N/A#

0N/A# Permission is hereby granted, free of charge, to any person obtaining a

0N/A# copy of this software and associated documentation files (the

0N/A# "Software"), to deal in the Software without restriction, including

0N/A# without limitation the rights to use, copy, modify, merge, publish,

0N/A# distribute, and/or sell copies of the Software, and to permit persons

0N/A# to whom the Software is furnished to do so, provided that the above

0N/A# copyright notice(s) and this permission notice appear in all copies of

0N/A# the Software and that both the above copyright notice(s) and this

0N/A# permission notice appear in supporting documentation.

0N/A#

0N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

0N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

0N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

0N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

0N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

0N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

0N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

0N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

0N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

0N/A#

0N/A# Except as contained in this notice, the name of a copyright holder

0N/A# shall not be used in advertising or otherwise to promote the sale, use

0N/A# or other dealings in this Software without prior written authorization

0N/A# of the copyright holder.

0N/A

0N/A

0N/Adiff -urp -x '*~' os/utils.c os/utils.c

0N/A--- os/utils.c 2006-12-21 10:50:47.000000000 -0800

0N/A+++ os/utils.c 2006-12-21 14:20:53.648154000 -0800

0N/A@@ -630,9 +630,11 @@ void UseMsg(void)

0N/A #ifdef RLIMIT_STACK

0N/A ErrorF("-ls int limit stack space to N Kb\n");

0N/A #endif

0N/A+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */

0N/A #ifdef SERVER_LOCK

0N/A ErrorF("-nolock disable the locking mechanism\n");

0N/A #endif

0N/A+#endif

0N/A #ifndef NOLOGOHACK

0N/A ErrorF("-logo enable logo in screen saver\n");

0N/A ErrorF("nologo disable logo in screen saver\n");

@@ -914,6 +916,7 @@ ProcessCommandLine(int argc, char *argv[

UseMsg();

}

#endif

+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */

#ifdef SERVER_LOCK

else if ( strcmp ( argv[i], "-nolock") == 0)

{

@@ -925,6 +928,7 @@ ProcessCommandLine(int argc, char *argv[

nolock = TRUE;

}

#endif

+#endif

#ifndef NOLOGOHACK

else if ( strcmp( argv[i], "-logo") == 0)

{