open-src/xserver/xorg/cli-nobanner.patch
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Tue, 31 Jul 2007 15:09:29 -0700
changeset 194 c2b76d8a41f7
parent 98 c21b46ed1efd
child 606 068c11b419c9
permissions -rw-r--r--
6580970 Xorg Server 1.3 [PSARC 2007/434]

# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, and/or sell copies of the Software, and to permit persons
# to whom the Software is furnished to do so, provided that the above
# copyright notice(s) and this permission notice appear in all copies of
# the Software and that both the above copyright notice(s) and this
# permission notice appear in supporting documentation.
# 
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# 
# Except as contained in this notice, the name of a copyright holder
# shall not be used in advertising or otherwise to promote the sale, use
# or other dealings in this Software without prior written authorization
# of the copyright holder.

diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
--- os/utils.c	2007-07-30 18:32:29.905008000 -0700
+++ os/utils.c	2007-07-30 18:32:46.146428000 -0700
@@ -913,6 +913,12 @@ ProcessCommandLine(int argc, char *argv[
 	}
 #endif
 #endif
+#ifdef SUNSOFT
+	else if ( strcmp( argv[i], "-nobanner") == 0)
+	{
+	  /* ignore - just maintaining compatibility with Xsun CLI */
+	}
+#endif
 #ifndef NOLOGOHACK
 	else if ( strcmp( argv[i], "-logo") == 0)
 	{