Mercurial > illumos > illumos-gate

changeset 12041:03c4bd206296

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6937884 s/Sun/Oracle/g
author John Beck <John.Beck@Sun.COM>
date Mon, 29 Mar 2010 23:15:22 -0700
parents 4962fe87590d
children 1385a1141154
files usr/src/cmd/Adm/sun/Makefile usr/src/cmd/init/init.c usr/src/pkg/license_files/cr_Sun usr/src/prototypes/prototype.Makefile usr/src/prototypes/prototype.c usr/src/prototypes/prototype.csh usr/src/prototypes/prototype.h usr/src/prototypes/prototype.java usr/src/prototypes/prototype.ksh usr/src/prototypes/prototype.man usr/src/prototypes/prototype.mapfile-vers usr/src/prototypes/prototype.pl usr/src/prototypes/prototype.py usr/src/prototypes/prototype.s usr/src/prototypes/prototype.sh usr/src/tools/onbld/Checks/Copyright.py usr/src/uts/common/os/logsubr.c
diffstat 17 files changed, 62 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/Adm/sun/Makefile	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/cmd/Adm/sun/Makefile	Mon Mar 29 23:15:22 2010 -0700
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 ETCFILES= ioctl.syscon passwd shadow motd
@@ -52,8 +51,8 @@
 
 motd:	FRC
 	@-$(ECHO) "rebuilding motd"
-	@$(RELEASE_BUILD)-$(ECHO) "Sun Microsystems Inc.\tSunOS $(RELEASE)\t$(VERSION)\t$(RELEASE_DATE)" > motd
-	@$(NOT_RELEASE_BUILD)-$(ECHO) "Sun Microsystems Inc.\tSunOS $(RELEASE)\t$(VERSION)\t`date +'%h. %d, %Y'`" > motd
+	@$(RELEASE_BUILD)-$(ECHO) "Oracle Corporation\tSunOS $(RELEASE)\t$(VERSION)\t$(RELEASE_DATE)" > motd
+	@$(NOT_RELEASE_BUILD)-$(ECHO) "Oracle Corporation\tSunOS $(RELEASE)\t$(VERSION)\t`date +'%h. %d, %Y'`" > motd
 	@$(NOT_RELEASE_BUILD)-$(ECHO) $(DEV_CM) | sed -e "s/@(#)//" >> motd
 	@-$(CAT) release_info >> motd
 
--- a/usr/src/cmd/init/init.c	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/cmd/init/init.c	Mon Mar 29 23:15:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -695,10 +694,8 @@
 		    "\n\n%s Release %s Version %s %d-bit\r\n",
 		    un.sysname, un.release, un.version, bits);
 		console(B_FALSE,
-		    "Copyright 1983-2010 Sun Microsystems, Inc. "
+		    "Copyright (c) 1983, 2010, Oracle and/or its affiliates."
 		    " All rights reserved.\r\n");
-		console(B_FALSE,
-		    "Use is subject to license terms.\r\n");
 	}
 
 	/*
--- a/usr/src/pkg/license_files/cr_Sun	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/pkg/license_files/cr_Sun	Mon Mar 29 23:15:22 2010 -0700
@@ -1,2 +1,1 @@
-Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-Use is subject to license terms.
+Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
--- a/usr/src/prototypes/prototype.Makefile	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.Makefile	Mon Mar 29 23:15:22 2010 -0700
@@ -20,7 +20,6 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
--- a/usr/src/prototypes/prototype.c	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.c	Mon Mar 29 23:15:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
--- a/usr/src/prototypes/prototype.csh	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.csh	Mon Mar 29 23:15:22 2010 -0700
@@ -21,7 +21,6 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
--- a/usr/src/prototypes/prototype.h	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.h	Mon Mar 29 23:15:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef _HEADER_H
--- a/usr/src/prototypes/prototype.java	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.java	Mon Mar 29 23:15:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
--- a/usr/src/prototypes/prototype.ksh	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.ksh	Mon Mar 29 23:15:22 2010 -0700
@@ -21,7 +21,6 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
--- a/usr/src/prototypes/prototype.man	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.man	Mon Mar 29 23:15:22 2010 -0700
@@ -17,7 +17,6 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-.\" Use is subject to license terms.
+.\" Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 .\"
 
--- a/usr/src/prototypes/prototype.mapfile-vers	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.mapfile-vers	Mon Mar 29 23:15:22 2010 -0700
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
--- a/usr/src/prototypes/prototype.pl	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.pl	Mon Mar 29 23:15:22 2010 -0700
@@ -21,8 +21,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
--- a/usr/src/prototypes/prototype.py	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.py	Mon Mar 29 23:15:22 2010 -0700
@@ -21,8 +21,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
--- a/usr/src/prototypes/prototype.s	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.s	Mon Mar 29 23:15:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 	.file	"prototype.s"
--- a/usr/src/prototypes/prototype.sh	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/prototypes/prototype.sh	Mon Mar 29 23:15:22 2010 -0700
@@ -21,6 +21,5 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
--- a/usr/src/tools/onbld/Checks/Copyright.py	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/tools/onbld/Checks/Copyright.py	Mon Mar 29 23:15:22 2010 -0700
@@ -21,10 +21,7 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -50,16 +47,21 @@
 # pre-2002 copyright with 'by'
 oldcopyright1 = re.compile(r'Copyright .* by Sun Microsystems, Inc\.')
 
-# Valid, current copyright
-goodcopyright = re.compile(r'Copyright ([\d, -]+) Sun Microsystems, Inc\.' +
-			   r'(\s+)(All rights reserved\.)?')
+# last valid Sun copyright
+suncopyright = re.compile(r'Copyright ([\d, -]+) Sun Microsystems, Inc\.' +
+			  r'(\s+)(All rights reserved\.)?')
 
+# old, check to make sure no longer present
 licterms = 'Use is subject to license terms.'
 
+# initial Oracle copyright
+goodcopyright = re.compile(r'Copyright \(c\) (\d\d\d\d, )?(\d\d\d\d)(,)? ' +
+			   r'Oracle and/or its affiliates\.(\s+)' +
+			   r'All rights reserved\.')
+
 def copyright(fh, filename=None, output=sys.stderr):
 	ret = lineno = rights = 0
-	# Are we expecting the license terms message on this line?
-	expecting_license = False
+	check_license = False
 
 	if not filename:
 		filename = fh.name
@@ -67,63 +69,64 @@
 	for line in fh:
 		lineno += 1
 
-		if expecting_license:
-			expecting_license = False
-
-			if licterms not in line:
-				err(output, "'%s' message missing" % licterms,
+		if check_license:
+			check_license = False
+			if licterms in line:
+				err(output, "old '%s' message found" % licterms,
 				    filename, lineno)
 				ret = 1
 				continue
-			elif rights > 0 and ret == 0:
-				return 0
-			continue
 
 		if oldcopyright.search(line):
-			err(output, "old copyright with '(c)'", filename,
+			err(output, "ancient Sun copyright", filename,
 			    lineno)
 			rights += 1
 			ret = 1
+			check_license = True
+			continue
 		elif oldcopyright1.search(line):
-			err(output, "old copyright with 'by'", filename, lineno)
+			err(output, "pre-2002 Sun copyright", filename, lineno)
 			rights += 1
 			ret = 1
+			check_license = True
+			continue
+		elif suncopyright.search(line):
+			err(output, "old Sun copyright", filename, lineno)
+			rights += 1
+			ret = 1
+			check_license = True
+			continue
 
 		#
-		# group 1 = year
-		# group 2 = spacing
-		# group 3 = All rights reserved message.
+		# group 1 = optional initial year
+		# group 2 = current year
+		# group 3 = comma after current year
+		# group 4 = spacing between phrases
 		#
 		match = goodcopyright.search(line)
 		if match:
-			expecting_license = True
+			# only check for the old license message on the line
+			# following a copyright match
+			check_license = True
 			rights += 1
 
 			year = time.strftime('%Y')
-			if match.group(1) != year:
+			if match.group(2) != year:
 				err(output, "wrong copyright year %s, should "
 				    "be %s" %
-				    (match.group(1), year), filename, lineno)
+				    (match.group(2), year), filename, lineno)
 				ret = 1
 
-			if not match.group(3):
-				err(output, "'All rights reserved.' message "
-				    "missing",
+			if match.group(3) != ',':
+				err(output, "need comma after current year",
 				    filename, lineno)
 				ret = 1
-			elif match.group(2) != '  ':
-				err(output, "need two spaces between copyright "
+
+			if match.group(4) != ' ':
+				err(output, "need one space between copyright "
 				    "and all rights reserved phrases",
 				    filename, lineno)
 				ret = 1
-	#
-	# If the last line left us expecting the license message,
-	# we're pretty sure it isn't going to be there.
-	#
-	if expecting_license:
-		err(output, "'Use is subject to license terms.' message "
-		    "missing", filename, lineno)
-		ret = 1
 
 	if rights == 0:
 		err(output, "no copyright message found", filename)
--- a/usr/src/uts/common/os/logsubr.c	Mon Mar 29 23:08:59 2010 -0700
+++ b/usr/src/uts/common/os/logsubr.c	Mon Mar 29 23:15:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <sys/types.h>
@@ -249,8 +248,8 @@
 	 */
 	printf("\rSunOS Release %s Version %s %u-bit\n",
 	    utsname.release, utsname.version, NBBY * (uint_t)sizeof (void *));
-	printf("Copyright 1983-2010 Sun Microsystems, Inc.  "
-	    "All rights reserved.\nUse is subject to license terms.\n");
+	printf("Copyright (c) 1983, 2010, Oracle and/or its affiliates. "
+	    "All rights reserved.\n");
 #ifdef DEBUG
 	printf("DEBUG enabled\n");
 #endif