Update Sun license notices to current X.Org standard form

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

1 files changed, 21 insertions, 23 deletions

diff --git a/exec.c b/exec.c
index 4c77e35..473a590 100644
--- a/exec.c
+++ b/exec.c
@@ -29,31 +29,29 @@ from The Open Group.
 */
 
 /*
- * Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
+ * Copyright © 1987 Sun Microsystems, Inc.  All rights reserved.
  *
- *                     All Rights Reserved
- * 
- * Permission  to  use,  copy,  modify,  and  distribute   this
- * software  and  its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright no-
- * tice  appear  in all copies and that both that copyright no-
- * tice and this permission notice appear in  supporting  docu-
- * mentation,  and  that the name of Sun not be used in
- * advertising or publicity pertaining to distribution  of  the
- * software  without specific prior written permission. Sun
- * makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without any
- * express or implied warranty.
- * 
- * SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO  THIS  SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
- * NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE  LI-
- * ABLE  FOR  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.
+ * 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, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * 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.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/*
  * Author:  Jim Fulton, MIT X Consortium; derived from parts of the
  * original xmodmap, written by David Rosenthal, of Sun Microsystems.
  */