--- a/usr/src/cmd/acctadm/main.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/acctadm/main.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,9 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <sys/acctctl.h>
@@ -134,7 +134,7 @@
 
 	(void) setlocale(LC_ALL, "");
 	(void) textdomain(TEXT_DOMAIN);
-	(void) setprogname(argv[0]);
+	(void) setpname(argv[0]);
 
 	for (; optind < argc; optind++) {
 		while ((c = getopt(argc, argv, OPTS)) != (int)EOF) {

--- a/usr/src/cmd/acctadm/utils.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/acctadm/utils.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,9 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <assert.h>
@@ -85,7 +85,7 @@
 }
 
 char *
-setprogname(char *arg0)
+setpname(char *arg0)
 {
 	char *p = strrchr(arg0, '/');
 

--- a/usr/src/cmd/acctadm/utils.h	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/acctadm/utils.h	Thu Aug 12 14:55:22 2010 -0700
@@ -18,9 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef	_UTILS_H
@@ -42,7 +42,7 @@
 
 extern void warn(const char *, ...);
 extern void die(char *, ...);
-extern char *setprogname(char *);
+extern char *setpname(char *);
 extern const char *ac_type_name(int);
 extern int open_exacct_file(const char *, int);
 extern boolean_t verify_exacct_file(const char *, int);

--- a/usr/src/cmd/awk/awk.h	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/awk/awk.h	Thu Aug 12 14:55:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -362,6 +361,6 @@
 extern Cell *call(Node **, int);
 extern Cell *arg(Node **, int);
 extern Cell *getnf(Node **, int);
-extern Cell *getline(Node **, int);
+extern Cell *getaline(Node **, int);
 
 #endif /* AWK_H */

--- a/usr/src/cmd/awk/maketab.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/awk/maketab.c	Thu Aug 12 14:55:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -101,7 +100,7 @@
 	{ CALL, "call", "call" },
 	{ ARG, "arg", "arg" },
 	{ VARNF, "getnf", "NF" },
-	{ GETLINE, "getline", "getline" },
+	{ GETLINE, "getaline", "getline" },
 	{ 0, "", "" },
 };
 

--- a/usr/src/cmd/awk/run.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/awk/run.c	Thu Aug 12 14:55:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -359,7 +358,7 @@
 }
 
 Cell *
-getline(Node **a, int n)
+getaline(Node **a, int n)
 {
 	/* a[0] is variable, a[1] is operator, a[2] is filename */
 	register Cell *r, *x;

--- a/usr/src/cmd/bnu/sysfiles.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/bnu/sysfiles.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,17 +18,14 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 1998 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	*/
 /*	  All Rights Reserved  	*/
 
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "uucp.h"
 
 #include <unistd.h>
@@ -55,7 +51,7 @@
 /* private variables */
 static void tokenize(), nameparse(), setfile(), setioctl(),
 	scansys(), scancfg(), setconfig();
-static int namematch(), nextdialers(), nextdevices(), nextsystems(), getline();
+static int namematch(), nextdialers(), nextdevices(), nextsystems(), getaline();
 
 /* pointer arrays might be dynamically allocated */
 static char *Systems[64] = {0};	/* list of Systems files */
@@ -164,7 +160,7 @@
 
 	Systems[0] = Devices[0] = Dialers[0] = NULL;
 	if ((f = fopen(SYSFILES, "r")) != 0) {
-		while (getline(f, buf) > 0) { 
+		while (getaline(f, buf) > 0) { 
 			/* got a (logical) line from Sysfiles */
 			/* strtok's of this buf continue in tokenize() */
 			tok = strtok(buf, " \t");
@@ -215,7 +211,7 @@
 	msgtime = MSGTIME;
 
 	if ((f = fopen(DEVCONFIG, "r")) != 0) {
-		while (getline(f, buf) > 0) {
+		while (getaline(f, buf) > 0) {
 			/* got a (logical) line from Devconfig */
 			/* strtok's of this buf continue in tokenize() */
 			tok = strtok(buf, " \t");
@@ -241,7 +237,7 @@
  */
 
 static int
-getline(f, line)
+getaline(f, line)
 FILE *f;
 char *line;
 {	char *lptr, *lend;
@@ -484,7 +480,7 @@
 
 	ASSERT(len >= BUFSIZ, "BUFFER TOO SMALL", "getsysline", 0);
 	for(;;) {
-		while (getline(fsystems, buf) != NULL)
+		while (getaline(fsystems, buf) != NULL)
 		    if ((*buf != '#') && (*buf != ' ') &&
 			(*buf != '\t') && (*buf != '\n')) {
 			(void) _uu_resetlocale(LC_ALL, prev);
@@ -752,7 +748,7 @@
     extern char _ProtoCfg[];
 
     if ((f = fopen(CONFIG, "r")) != 0) {
-	while (getline(f, buf) > 0) { 
+	while (getaline(f, buf) > 0) { 
 	    /* got a (logical) line from Config file */
 	    tok = strtok(buf, " \t");
 	    if ( (tok != NULL) && (*tok != '#') ) {

--- a/usr/src/cmd/boot/bootadm/bootadm_hyper.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/boot/bootadm/bootadm_hyper.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,9 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <stdio.h>
@@ -347,9 +347,8 @@
 
 	if ((strncmp(optstr, "ttya-mode", namlen) == 0) ||
 	    (strncmp(optstr, "ttyb-mode", namlen) == 0)) {
-		char *port = alloca(namlen + 1);
+		char *port = strndupa(optstr, namlen);
 
-		(void) strlcpy(port, optstr, namlen + 1);
 		return (serial_metal_to_hyper(port, value));
 	}
 
@@ -840,19 +839,15 @@
 		 * Process important lines from menu.lst boot entry.
 		 */
 		if (lp->flags == BAM_TITLE) {
-			title = alloca(strlen(lp->arg) + 1);
-			(void) strcpy(title, lp->arg);
+			title = strdupa(lp->arg);
 		} else if (lp->cmd != NULL) {
 			if (strcmp(lp->cmd, "findroot") == 0) {
-				findroot = alloca(strlen(lp->arg) + 1);
-				(void) strcpy(findroot, lp->arg);
+				findroot = strdupa(lp->arg);
 			} else if (strcmp(lp->cmd, "bootfs") == 0) {
-				bootfs = alloca(strlen(lp->arg) + 1);
-				(void) strcpy(bootfs, lp->arg);
+				bootfs = strdupa(lp->arg);
 			} else if (strcmp(lp->cmd,
 			    menu_cmds[MODULE_DOLLAR_CMD]) == 0) {
-				module = alloca(strlen(lp->arg) + 1);
-				(void) strcpy(module, lp->arg);
+				module = strdupa(lp->arg);
 			} else if ((strcmp(lp->cmd,
 			    menu_cmds[KERNEL_DOLLAR_CMD]) == 0) &&
 			    (ret = cvt_metal_kernel(lp->arg,
@@ -1065,25 +1060,19 @@
 		 * Process important lines from menu.lst boot entry.
 		 */
 		if (lp->flags == BAM_TITLE) {
-			title = alloca(strlen(lp->arg) + 1);
-			(void) strcpy(title, lp->arg);
+			title = strdupa(lp->arg);
 		} else if (lp->cmd != NULL) {
 			if (strcmp(lp->cmd, "findroot") == 0) {
-				findroot = alloca(strlen(lp->arg) + 1);
-				(void) strcpy(findroot, lp->arg);
+				findroot = strdupa(lp->arg);
 			} else if (strcmp(lp->cmd, "bootfs") == 0) {
-				bootfs = alloca(strlen(lp->arg) + 1);
-				(void) strcpy(bootfs, lp->arg);
+				bootfs = strdupa(lp->arg);
 			} else if (strcmp(lp->cmd,
 			    menu_cmds[MODULE_DOLLAR_CMD]) == 0) {
 				if (strstr(lp->arg, "boot_archive") == NULL) {
-					module = alloca(strlen(lp->arg) + 1);
-					(void) strcpy(module, lp->arg);
+					module = strdupa(lp->arg);
 					cvt_hyper_module(module, &kern_path);
 				} else {
-					barchive_path =
-					    alloca(strlen(lp->arg) + 1);
-					(void) strcpy(barchive_path, lp->arg);
+					barchive_path = strdupa(lp->arg);
 				}
 			} else if ((strcmp(lp->cmd,
 			    menu_cmds[KERNEL_DOLLAR_CMD]) == 0) &&

--- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile	Thu Aug 12 14:55:22 2010 -0700
@@ -1,6 +1,5 @@
 #
-# 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.
 #
 
 PROG=		in.ftpd ftpcount ftpshut ftprestart privatepw
@@ -15,8 +14,7 @@
 		access.o extensions.o realpath.o acl.o private.o \
 		authenticate.o conversions.o rdservers.o paths.o hostacc.o \
 		routevector.o restrict.o domain.o wu_fnmatch.o timeout.o \
-		getpwnam.o strsep.o strcasestr.o inet.o xferlog.o gssutil.o \
-		privs.o
+		getpwnam.o inet.o xferlog.o gssutil.o privs.o
 FTPCOUNT_OBJS=	$(COMMON_OBJS) ftpcount.o rdservers.o inet.o
 FTPSHUT_OBJS=	$(COMMON_OBJS) ftpshut.o rdservers.o inet.o
 FTPREST_OBJS=	$(COMMON_OBJS) ftprestart.o rdservers.o inet.o

--- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/proto.h	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/proto.h	Thu Aug 12 14:55:22 2010 -0700
@@ -336,8 +336,3 @@
  */
 char *getusershell(void);
 void endusershell(void);
-
-/*
-   ** support/strcasestr.c
- */
-char *strcasestr(register char *s, register char *find);

--- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/strcasestr.c	Thu Aug 12 14:07:03 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/****************************************************************************  
- 
-  Copyright (c) 1999,2000 WU-FTPD Development Group.  
-  All rights reserved.
-  
-  Portions Copyright (c) 1980, 1985, 1988, 1989, 1990, 1991, 1993, 1994
-    The Regents of the University of California.
-  Portions Copyright (c) 1993, 1994 Washington University in Saint Louis.
-  Portions Copyright (c) 1996, 1998 Berkeley Software Design, Inc.
-  Portions Copyright (c) 1989 Massachusetts Institute of Technology.
-  Portions Copyright (c) 1998 Sendmail, Inc.
-  Portions Copyright (c) 1983, 1995, 1996, 1997 Eric P.  Allman.
-  Portions Copyright (c) 1997 by Stan Barber.
-  Portions Copyright (c) 1997 by Kent Landfield.
-  Portions Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997
-    Free Software Foundation, Inc.  
- 
-  Use and distribution of this software and its source code are governed 
-  by the terms and conditions of the WU-FTPD Software License ("LICENSE").
- 
-  If you did not receive a copy of the license, it may be obtained online
-  at http://www.wu-ftpd.org/license.html.
- 
-  $Id: strcasestr.c,v 1.5 2000/07/01 18:36:29 wuftpd Exp $
- 
-****************************************************************************/
-#include <string.h>
-/*
- * Find the first occurrence of find in s.
- */
-char *strcasestr(register char *s, register char *find)
-{
-    register char c, sc;
-    register size_t len;
-
-    if ((c = *find++) != 0) {
-	len = strlen(find);
-	do {
-	    do {
-		if ((sc = *s++) == 0)
-		    return (NULL);
-	    } while (sc != c);
-	} while (strncasecmp(s, find, len) != 0);
-	s--;
-    }
-    return ((char *) s);
-}

--- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/strsep.c	Thu Aug 12 14:07:03 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/****************************************************************************  
- 
-  Copyright (c) 1999,2000 WU-FTPD Development Group.  
-  All rights reserved.
-  
-  Portions Copyright (c) 1980, 1985, 1988, 1989, 1990, 1991, 1993, 1994
-    The Regents of the University of California.
-  Portions Copyright (c) 1993, 1994 Washington University in Saint Louis.
-  Portions Copyright (c) 1996, 1998 Berkeley Software Design, Inc.
-  Portions Copyright (c) 1989 Massachusetts Institute of Technology.
-  Portions Copyright (c) 1998 Sendmail, Inc.
-  Portions Copyright (c) 1983, 1995, 1996, 1997 Eric P.  Allman.
-  Portions Copyright (c) 1997 by Stan Barber.
-  Portions Copyright (c) 1997 by Kent Landfield.
-  Portions Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997
-    Free Software Foundation, Inc.  
- 
-  Use and distribution of this software and its source code are governed 
-  by the terms and conditions of the WU-FTPD Software License ("LICENSE").
- 
-  If you did not receive a copy of the license, it may be obtained online
-  at http://www.wu-ftpd.org/license.html.
- 
-  $Id: strsep.c,v 1.6 2000/07/01 18:36:29 wuftpd Exp $
- 
-****************************************************************************/
-#include <string.h>
-#include <stdio.h>
-
-/*
- * Get next token from string *stringp, where tokens are nonempty
- * strings separated by characters from delim.
- *
- * Writes NULLs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- */
-char *strsep(register char **stringp, register const char *delim)
-{
-    register char *s;
-    register const char *spanp;
-    register int c, sc;
-    char *tok;
-
-    if ((s = *stringp) == NULL)
-	return (NULL);
-    for (tok = s;;) {
-	c = *s++;
-	spanp = delim;
-	do {
-	    if ((sc = *spanp++) == c) {
-		if (c == 0)
-		    s = NULL;
-		else
-		    s[-1] = 0;
-		*stringp = s;
-		return (tok);
-	    }
-	} while (sc != 0);
-    }
-    /* NOTREACHED */
-}

--- a/usr/src/cmd/cpc/common/strtoset.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/cpc/common/strtoset.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,14 +18,13 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <alloca.h>
 #include <errno.h>
 #include <libintl.h>
 
@@ -491,7 +490,7 @@
 
 	toks[x] = NULL;
 
-	opts = strcpy(alloca(strlen(spec) + 1), spec);
+	opts = strdupa(spec);
 	while (*opts != '\0') {
 		int idx = getsubopt(&opts, toks, &val);
 

--- a/usr/src/cmd/csplit/csplit.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/csplit/csplit.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,16 +18,13 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
 
 /*
  * csplit - Context or line file splitter
@@ -83,7 +79,7 @@
 static offset_t findline(char *, offset_t);
 static void flush(void);
 static FILE *getfile(void);
-static char *getline(int);
+static char *getaline(int);
 static void line_arg(char *);
 static void num_arg(char *, int);
 static void re_arg(char *);
@@ -143,13 +139,13 @@
 				if (errno == ENOSPC) {
 					(void) fprintf(stderr, "csplit: ");
 					(void) fprintf(stderr, gettext(
-						"No space left on device\n"));
+					    "No space left on device\n"));
 					exit(1);
 				} else {
 					(void) fprintf(stderr, "csplit: ");
 					(void) fprintf(stderr, gettext(
-						"Bad write to temporary "
-							"file\n"));
+					    "Bad write to temporary "
+					    "file\n"));
 					exit(1);
 				}
 
@@ -294,7 +290,7 @@
  * Its arguments are a pointer to the compiled regular expression(expr),
  * and an offset(oset).  The variable lncnt is used to count the number
  * of lines searched.  First the current stream location is saved via
- * ftello(), and getline is called so that R.E. searching starts at the
+ * ftello(), and getaline is called so that R.E. searching starts at the
  * line after the previously referenced line.  The while loop checks
  * that there are more lines(error if none), bumps the line count, and
  * checks for the R.E. on each line.  If the R.E. matches on one of the
@@ -310,11 +306,11 @@
 
 	saveloc = ftello(infile);
 	if (curline != (offset_t)1 || benhere)	/* If first line, first time, */
-		(void) getline(FALSE);		/* then don't skip */
+		(void) getaline(FALSE);		/* then don't skip */
 	else
 		lncnt--;
 	benhere = 1;
-	while (getline(FALSE) != NULL) {
+	while (getaline(FALSE) != NULL) {
 		lncnt++;
 		if ((sptr = strrchr(linbuf, '\n')) != NULL)
 			*sptr = '\0';
@@ -362,7 +358,8 @@
 
 	if (create) {
 		if (fptr == 0)
-			for (fptr = file; *fptr != NULL; fptr++);
+			for (fptr = file; *fptr != NULL; fptr++)
+				continue;
 		(void) sprintf(fptr, "%.*d", fiwidth, ctr++);
 
 		/* check for suffix length overflow */
@@ -406,12 +403,12 @@
 /*
  * Getline gets a line via fgets from the input stream "infile".
  * The line is put into linbuf and may not be larger than LINSIZ.
- * If getline is called with a non-zero value, the current line
+ * If getaline is called with a non-zero value, the current line
  * is bumped, otherwise it is not(for R.E. searching).
  */
 
 static char *
-getline(int bumpcur)
+getaline(int bumpcur)
 {
 	char *ret;
 	if (bumpcur)
@@ -570,15 +567,15 @@
 		if (curline > ln)
 			fatal("%s - out of range\n", targ);
 		while (curline < ln) {
-			if (getline(TRUE) == NULL)
+			if (getaline(TRUE) == NULL)
 				fatal("%s - out of range\n", targ);
 			flush();
 		}
 	} else		/* last file */
-		if (getline(TRUE) != NULL) {
+		if (getaline(TRUE) != NULL) {
 			flush();
 			for (;;) {
-				if (getline(TRUE) == NULL)
+				if (getaline(TRUE) == NULL)
 					break;
 				flush();
 			}
@@ -591,7 +588,7 @@
 usage()
 {
 	(void) fprintf(stderr, gettext(
-		"usage: csplit [-ks] [-f prefix] [-n number] "
-			"file arg1 ...argn\n"));
+	    "usage: csplit [-ks] [-f prefix] [-n number] "
+	    "file arg1 ...argn\n"));
 	exit(1);
 }

--- a/usr/src/cmd/devctl/devctl.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/devctl/devctl.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,14 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-
 /*
  * devctl - device control utility
  *
@@ -107,7 +103,7 @@
 
 extern int errno;
 
-static void setprogname(char *name);
+static void setpname(char *name);
 static void print_bus_state(char *devname, uint_t state);
 static void print_dev_state(char *devname, uint_t state);
 static int dev_getstate(devctl_hdl_t);
@@ -191,7 +187,7 @@
 	devctl_hdl_t dcp;
 	struct stat stat_buf;
 
-	setprogname(argv[0]);
+	setpname(argv[0]);
 	while ((c = getopt(argc, argv, "vd")) != -1)  {
 		switch (c)  {
 		case 'v':
@@ -255,8 +251,8 @@
 			if ((pathlen = readlink(orig_path, devctl_device,
 			    MAXPATHLEN)) == -1)  {
 				(void) fprintf(stderr,
-					"devctl: readlink(%s) - %s\n",
-					orig_path, strerror(errno));
+				    "devctl: readlink(%s) - %s\n",
+				    orig_path, strerror(errno));
 				exit(-1);
 			}
 			devctl_device[pathlen] = '\0';
@@ -308,16 +304,16 @@
 		dcp = devctl_pm_dev_acquire(devctl_device, 0);
 		if (dcp == NULL) {
 			(void) fprintf(stderr,
-				"devctl: device_pm_dev_acquire %s - %s\n",
-				devctl_device, strerror(errno));
+			    "devctl: device_pm_dev_acquire %s - %s\n",
+			    devctl_device, strerror(errno));
 			exit(-1);
 		}
 	} else {
 		dcp = devctl_device_acquire(devctl_device, 0);
 		if (dcp == NULL) {
 			(void) fprintf(stderr,
-				"devctl: device_acquire %s - %s\n",
-				devctl_device, strerror(errno));
+			    "devctl: device_acquire %s - %s\n",
+			    devctl_device, strerror(errno));
 			exit(-1);
 		}
 	}
@@ -516,7 +512,7 @@
 }
 
 static void
-setprogname(char *name)
+setpname(char *name)
 {
 	register char *p;
 

--- a/usr/src/cmd/diff3/diff3prog.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/diff3/diff3prog.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,16 +18,13 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -105,7 +102,7 @@
 static int number(char **lc);
 static int digit(int c);
 static int getchange(FILE *b);
-static int getline(FILE *b);
+static int getaline(FILE *b);
 static void merge(int m1, int m2);
 static void separate(char *s);
 static void change(int i, struct range *rold, int dup);
@@ -154,9 +151,9 @@
 		usage();
 	if (oflag) {
 		(void) snprintf(f1mark, sizeof (f1mark), "<<<<<<< %s",
-						argc >= 7 ? argv[6] : argv[3]);
+		    argc >= 7 ? argv[6] : argv[3]);
 		(void) snprintf(f3mark, sizeof (f3mark), ">>>>>>> %s",
-						argc >= 8 ? argv[7] : argv[5]);
+		    argc >= 8 ? argv[7] : argv[5]);
 	}
 
 	m = readin(argv[1], d13);
@@ -165,7 +162,7 @@
 		if ((fp[i] = fopen(argv[i+3], "r")) == NULL) {
 			save_err = errno;
 			(void) fprintf(stderr, "diff3: can't open %s: ",
-				argv[i+3]);
+			    argv[i+3]);
 			errno = save_err;
 			perror("");
 			exit(1);
@@ -250,14 +247,14 @@
 static int
 getchange(FILE *b)
 {
-	while (getline(b))
+	while (getaline(b))
 		if (digit(line[0]))
 			return (1);
 	return (0);
 }
 
 static int
-getline(FILE *b)
+getaline(FILE *b)
 {
 	int i, c;
 	for (i = 0; i < sizeof (line)-1; i++) {
@@ -288,10 +285,10 @@
 	for (; (t1 = d1 < d13+m1) | (t2 = d2 < d23+m2); ) {
 		if (debug) {
 			(void) printf("%d,%d=%d,%d %d,%d=%d,%d\n",
-			d1->old.from, d1->old.to,
-			d1->new.from, d1->new.to,
-			d2->old.from, d2->old.to,
-			d2->new.from, d2->new.to);
+			    d1->old.from, d1->old.to,
+			    d1->new.from, d1->new.to,
+			    d2->old.from, d2->old.to,
+			    d2->new.from, d2->new.to);
 		}
 
 		/* first file is different from others */
@@ -454,7 +451,7 @@
 {
 	int j, n;
 	for (n = 0; cline[i] < from-1; n += j) {
-		if ((j = getline(fp[i])) == 0)
+		if ((j = getaline(fp[i])) == 0)
 			trouble();
 		if (pr)
 			(void) printf("%s%s", pr, line);

--- a/usr/src/cmd/dis/dis_target.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/dis/dis_target.c	Thu Aug 12 14:55:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <assert.h>
@@ -100,10 +99,9 @@
 	Elf_Data	*ds_data;
 };
 
-/* Lifted from Psymtab.c */
+/* Lifted from Psymtab.c, omitting STT_TLS */
 #define	DATA_TYPES      \
-	((1 << STT_OBJECT) | (1 << STT_FUNC) | \
-	(1 << STT_COMMON) | (1 << STT_TLS))
+	((1 << STT_OBJECT) | (1 << STT_FUNC) | (1 << STT_COMMON))
 #define	IS_DATA_TYPE(tp)	(((1 << (tp)) & DATA_TYPES) != 0)
 
 /*

--- a/usr/src/cmd/ed/ed.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/ed/ed.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,16 +18,13 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
 
 /*
  * Editor
@@ -331,7 +327,7 @@
 static void	setzeroasone(void);
 static long	putline(void);
 static LINE	address(void);
-static char	*getline(long);
+static char	*getaline(long);
 static char	*getblock(long, long);
 static char	*place(char *, char *, char *);
 static void	comple(wchar_t);
@@ -693,7 +689,7 @@
 				putd();
 				putchr('\t');
 			}
-			puts(getline((a1++)->cur));
+			puts(getaline((a1++)->cur));
 		}
 		while (a1 <= addr2);
 		dot = addr2;
@@ -1441,7 +1437,7 @@
 	fp = genbuf;
 	a1 = addr1;
 	do {
-		lp = getline(a1++->cur);
+		lp = getaline(a1++->cur);
 		if (fss.Ffill && fss.Flim && lenchk(linebuf, &fss) < 0) {
 			write(1, gettext("line too long: lno = "),
 				strlen(gettext("line too long: lno = ")));
@@ -1676,7 +1672,7 @@
 }
 
 static char *
-getline(long tl)
+getaline(long tl)
 {
 	char *bp, *lp;
 	int nl;
@@ -1911,7 +1907,7 @@
 		return;
 	gp = genbuf;
 	for (a1 = addr1; a1 <= addr2; a1++) {
-		lp = getline(a1->cur);
+		lp = getaline(a1->cur);
 		while (*gp = *lp++)
 			if (gp++ > &genbuf[LBSIZE-1])
 				(void) error(27);
@@ -2259,7 +2255,7 @@
 
 	if (addr1 > addr2)
 		return (EOF);
-	(void) getline((addr1++)->cur);
+	(void) getaline((addr1++)->cur);
 	return (0);
 }
 
@@ -2292,7 +2288,7 @@
 	else {
 		if (addr == zero)
 			return (0);
-		p1 = getline(addr->cur);
+		p1 = getaline(addr->cur);
 		locs = 0;
 	}
 	return (step(p1, expbuf));
@@ -2595,7 +2591,7 @@
 		if (a1->cur & 01) {
 			a1->cur &= ~01;
 			dot = a1;
-			puts(getline(a1->cur));
+			puts(getaline(a1->cur));
 			if ((c = get_wchr()) == EOF)
 				(void) error(52);
 			if (c == 'a' || c == 'i' || c == 'c')

--- a/usr/src/cmd/eeprom/common/error.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/eeprom/common/error.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,9 @@
  *
  * CDDL HEADER END
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
- * Copyright 1989-2003 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <stdio.h>
@@ -36,7 +33,7 @@
 char *progname;
 
 void
-setprogname(char *name)
+setpname(char *name)
 {
 	register char *p = name, c;
 

--- a/usr/src/cmd/eeprom/i386/benv.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/eeprom/i386/benv.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,6 +18,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
  */
@@ -39,7 +40,7 @@
 extern void get_kbenv(void);
 extern void close_kbenv(void);
 extern caddr_t get_propval(char *name, char *node);
-extern void setprogname(char *prog);
+extern void setpname(char *prog);
 extern char *getbootcmd(void);
 
 char *boottree;
@@ -1052,7 +1053,7 @@
 	benv_des_t *bd;
 	char *file = NULL;
 
-	setprogname(argv[0]);
+	setpname(argv[0]);
 
 	while ((c = getopt(argc, argv, "f:Itv")) != -1)
 		switch (c) {

--- a/usr/src/cmd/eeprom/sparc/openprom.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/eeprom/sparc/openprom.c	Thu Aug 12 14:55:22 2010 -0700
@@ -1,7 +1,9 @@
 /*
  * Open Boot Prom eeprom utility
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ */
+
+/*
+ * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
@@ -42,7 +44,7 @@
 } Oppbuf;
 
 extern int _error(int do_perror, char *fmt, ...);
-extern void setprogname(char *);
+extern void setpname(char *);
 static int get_password(char *, int);
 extern int loadlogo(char *, int, int, char *);
 
@@ -133,7 +135,7 @@
 			    "[variable[=value] ...]", argv[0]));
 		}
 
-	setprogname(argv[0]);
+	setpname(argv[0]);
 
 	/*
 	 * If no arguments, dump all fields.

--- a/usr/src/cmd/env/env.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/env/env.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,23 +18,22 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+
 /*
  * Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
  *	  All Rights Reserved
  */
 
 /*
- */
-
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.5	*/
-
-/*
  *	env [ - ] [ name=value ]... [command arg...]
  *	set environment, then execute command (or print environment)
  *	- says start fresh, otherwise merge with inherited environment
  */
 
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -49,7 +47,6 @@
 
 
 static	void	Usage();
-static	char	*nullp = NULL;
 extern	char	**environ;
 
 
@@ -70,7 +67,7 @@
 
 	/* check for non-standard "-" option */
 	if ((argc > 1) && (strcmp(argv[1], "-")) == 0) {
-		environ = &nullp;
+		(void) clearenv();
 		for (i = 1; i < argc; i++)
 			argv[i] = argv[i+1];
 		argc--;
@@ -80,7 +77,7 @@
 	while ((opt = getopt(argc, argv, "i")) != EOF) {
 		switch (opt) {
 		case 'i':
-			environ = &nullp;
+			(void) clearenv();
 			break;
 
 		default:

--- a/usr/src/cmd/eqn/io.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/eqn/io.c	Thu Aug 12 14:55:22 2010 -0700
@@ -1,6 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -12,8 +11,6 @@
  * specifies the terms and conditions for redistribution.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "e.h"
 #include <stdlib.h>
 #include <locale.h>
@@ -27,7 +24,7 @@
 
 static void do_inline(void);
 int eqn(int, char *[]);
-static int getline(char *);
+static int getaline(char *);
 static void init(void);
 void nrwid(int, int, int);
 int oalloc(void);
@@ -53,7 +50,7 @@
 
 	setfile(argc, argv);
 	init_tbl();	/* install keywords in tables */
-	while ((type = getline(in)) != EOF) {
+	while ((type = getaline(in)) != EOF) {
 		eqline = linect;
 		if (in[0] == '.' && in[1] == 'E' && in[2] == 'Q') {
 			for (i = 11; i < 100; used[i++] = 0)
@@ -96,7 +93,7 @@
 }
 
 static int
-getline(char *s)
+getaline(char *s)
 {
 	int c;
 	while ((*s++ = c = gtc()) != '\n' && c != EOF && c != lefteq)
@@ -130,7 +127,7 @@
 			ofree(eqnreg);
 		}
 		printf(".ps \\n(99\n.ft \\n(98\n");
-	} while (getline(in) == lefteq);
+	} while (getaline(in) == lefteq);
 	if (*in)
 		printf(".as %d \"%s", ds, in);
 	printf(".ps \\n(99\n.ft \\n(98\n");

--- a/usr/src/cmd/fm/fmd/common/fmd_idspace.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/fm/fmd/common/fmd_idspace.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,13 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <fmd_alloc.h>
 #include <fmd_subr.h>
 #include <fmd_conf.h>
@@ -34,47 +31,6 @@
 #include <fmd_idspace.h>
 #include <fmd.h>
 
-static int
-highbit(ulong_t i)
-{
-	int h = 1;
-
-	if (i == 0)
-		return (0);
-
-#ifdef _LP64
-	if (i & 0xffffffff00000000ul) {
-		h += 32;
-		i >>= 32;
-	}
-#endif
-
-	if (i & 0xffff0000) {
-		h += 16;
-		i >>= 16;
-	}
-
-	if (i & 0xff00) {
-		h += 8;
-		i >>= 8;
-	}
-
-	if (i & 0xf0) {
-		h += 4;
-		i >>= 4;
-	}
-
-	if (i & 0xc) {
-		h += 2;
-		i >>= 2;
-	}
-
-	if (i & 0x2)
-		h += 1;
-
-	return (h);
-}
-
 fmd_idspace_t *
 fmd_idspace_create(const char *name, id_t min, id_t max)
 {
@@ -93,7 +49,7 @@
 	(void) fmd_conf_getprop(fmd.d_conf, "ids.max", &ids_max);
 
 	hashmax = max - min + 1;
-	hashlen = 1 << highbit(hashmax / ids_avg);
+	hashlen = 1 << fls(hashmax / ids_avg);
 	if (hashlen > ids_max)
 		hashlen = ids_max;
 

--- a/usr/src/cmd/fm/fmd/common/fmd_module.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/fm/fmd/common/fmd_module.c	Thu Aug 12 14:55:22 2010 -0700
@@ -958,8 +958,7 @@
 
 	ASSERT(fmd_module_locked(mp));
 
-	dictnam = alloca(strlen(dict) + 1);
-	(void) strcpy(dictnam, fmd_strbasename(dict));
+	dictnam = strdupa(fmd_strbasename(dict));
 
 	if ((p = strrchr(dictnam, '.')) != NULL &&
 	    strcmp(p, ".dict") == 0)

--- a/usr/src/cmd/fm/modules/common/ip-transport/ip.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/fm/modules/common/ip-transport/ip.c	Thu Aug 12 14:55:22 2010 -0700
@@ -34,7 +34,6 @@
 #include <strings.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <alloca.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <netdb.h>
@@ -1028,8 +1027,7 @@
 		(void) nvlist_add_uint8(ip_auth,
 		    FM_VERSION, FM_FMRI_AUTH_VERSION);
 
-		s = alloca(strlen(auth) + 1);
-		(void) strcpy(s, auth);
+		s = strdupa(auth);
 		fmd_prop_free_string(hdl, auth);
 
 		for (p = strtok_r(s, ",", &q); p != NULL;

--- a/usr/src/cmd/format/label.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/format/label.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,22 +18,15 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
  * This file contains the code relating to label manipulation.
  */
 
-#include "global.h"
-#include "label.h"
-#include "misc.h"
-#include "main.h"
-#include "partition.h"
-#include "ctlr_scsi.h"
-#include "checkdev.h"
 #include <string.h>
 #include <stdlib.h>
 #include <memory.h>
@@ -43,6 +36,13 @@
 #include <sys/uuid.h>
 #include <errno.h>
 #include <devid.h>
+#include "global.h"
+#include "label.h"
+#include "misc.h"
+#include "main.h"
+#include "partition.h"
+#include "ctlr_scsi.h"
+#include "checkdev.h"
 
 #if defined(_FIRMWARE_NEEDS_FDISK)
 #include <sys/dktp/fdisk.h>

--- a/usr/src/cmd/format/modify_partition.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/format/modify_partition.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,14 +18,16 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
  * This file contains functions to implement the partition menu commands.
  */
+#include <stdlib.h>
+#include <string.h>
 #include "global.h"
 #include "partition.h"
 #include "menu_partition.h"
@@ -36,9 +38,6 @@
 #include "label.h"
 #include "auto_sense.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef __STDC__
 
 /* Function prototypes for ANSI C Compilers */

--- a/usr/src/cmd/format/partition.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/format/partition.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,21 +18,21 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
  * This file contains functions that operate on partition tables.
  */
+#include <string.h>
+#include <stdlib.h>
 #include "global.h"
 #include "partition.h"
 #include "misc.h"
 #include "menu_command.h"
 #include "menu_partition.h"
-#include <string.h>
-#include <stdlib.h>
 
 
 /*

--- a/usr/src/cmd/fps/Makefile	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/fps/Makefile	Thu Aug 12 14:55: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) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.cmd
@@ -42,16 +41,12 @@
 check: fpsd
 
 #
-# Note that the compilation of fptest is handled differently.
-# If the primary compiler is not a Sun Studio compiler, fptest will
-# *not* be compiled. This is because fptest is dependent on some Sun
+# The compilation of fptest is forced to be done with the Sun
+# Studio compiler.  This is because fptest is dependent on some Sun
 # performance libraries provided as part of the Sun Studio compiler
-# installation. fptest statically links libsunperf.a, libfui.a,
-# libfai.a, libfsu.a, and libsunmath.a. The other SUBDIRS will be
-# compiled.
-#
-# If the make macro __GNUC is "#", it means Sun Studio compiler is being
-# used for the compilation.
+# installation.  fptest statically links libsunperf.a, libfui.a,
+# libfai.a, libfsu.a, and libsunmath.a.  The other SUBDIRS will be
+# compiled normally.
 #
 
 $(SUBDIRS): FRC
@@ -63,14 +58,11 @@
 		*)							\
 			if [ $@ != fptest ];				\
 			then						\
-				cd $@; pwd; VERSION='$(VERSION)' $(MAKE) \
-                                $(TARGET);									\
+				cd $@; pwd; VERSION='$(VERSION)'	\
+				$(MAKE) $(TARGET);			\
 			else						\
-				if [ "$(__GNUC)" = "#" ];               \
-				then					\
-					cd $@; pwd; VERSION='$(VERSION)' \
-                                        $(MAKE) $(TARGET);								\
-				fi					\
+				cd $@; pwd; VERSION='$(VERSION)'	\
+				$(MAKE) __GNUC=$(POUND_SIGN) $(TARGET);	\
 			fi						\
 			;;						\
 	esac

--- a/usr/src/cmd/fs.d/nfs/lib/nfslog_config.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/fs.d/nfs/lib/nfslog_config.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,13 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright (c) 1999 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <ctype.h>
 #include <errno.h>
 #include <locale.h>
@@ -90,7 +87,7 @@
 static void remove_config(nfsl_config_t **, nfsl_config_t *, nfsl_config_t **);
 void nfsl_printconfig(nfsl_config_t *);
 #endif /* DEBUG */
-static char *getline(FILE *, char *, char *, int);
+static char *gataline(FILE *, char *, char *, int);
 static int get_info(char *, char **, char **, char **, char **, char **,
 			char **, int *);
 static void free_config(nfsl_config_t *);
@@ -286,7 +283,7 @@
 	assert (*listpp != NULL);
 	tail = getlastconfig(*listpp);
 
-	while (getline(fp, NFSL_CONFIG_FILE_PATH, linebuf, sizeof (linebuf))) {
+	while (gataline(fp, NFSL_CONFIG_FILE_PATH, linebuf, sizeof (linebuf))) {
 		if (linebuf[0] == '\0') {
 			/*
 			 * ignore lines that exceed max size
@@ -939,13 +936,13 @@
 }
 
 /*
- * getline attempts to get a line from the configuration file,
+ * gataline attempts to get a line from the configuration file,
  * upto LINESZ. A line in the file is a concatenation of lines if the
  * continuation symbol '\' is used at the end of the line. Returns
  * line on success, a NULL on EOF, and an empty string on lines > linesz.
  */
 static char *
-getline(FILE *fp, char *path, char *line, int linesz) {
+gataline(FILE *fp, char *path, char *line, int linesz) {
 	register char *p = line;
 	register int len;
 	int excess = 0;

--- a/usr/src/cmd/fs.d/udfs/fsck/utilities.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/fs.d/udfs/fsck/utilities.c	Thu Aug 12 14:55:22 2010 -0700
@@ -1,6 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -25,8 +24,6 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -64,7 +61,7 @@
 void	flush(int32_t, struct bufarea *);
 int32_t	bread(int32_t, char *, daddr_t, long);
 void	bwrite(int, char *, daddr_t, long);
-static int32_t	getline(FILE *, char *, int32_t);
+static int32_t	getaline(FILE *, char *, int32_t);
 void errexit(char *, ...) __NORETURN;
 static long	diskreads, totalreads;	/* Disk cache statistics */
 offset_t	llseek();
@@ -86,7 +83,7 @@
 		(void) printf("\n");
 		(void) printf(
 		    gettext("%s: UNEXPECTED INCONSISTENCY; RUN fsck "
-			"MANUALLY.\n"), devname);
+		    "MANUALLY.\n"), devname);
 		va_end(args);
 		exit(36);
 	}
@@ -172,7 +169,7 @@
 
 	if (len > fsbsize) {
 		(void) printf(gettext("File entry at %x is too long "
-			"(%d bytes)\n"), block, len);
+		    "(%d bytes)\n"), block, len);
 		len = fsbsize;
 	}
 	bp = getdatablk((daddr_t)(block + part_start), fsbsize);
@@ -185,7 +182,7 @@
 	err = verifytag(&fp->fe_tag, block, &fp->fe_tag, UD_FILE_ENTRY);
 	if (err) {
 		(void) printf(gettext("Tag error %s or bad file entry, "
-			"tag=%d\n"), tagerrs[err], fp->fe_tag.tag_id);
+		    "tag=%d\n"), tagerrs[err], fp->fe_tag.tag_id);
 		bp->b_flags &= ~B_INUSE;
 		return (NULL);
 	}
@@ -220,7 +217,7 @@
 		(void) printf(gettext(" yes\n\n"));
 		return (1);
 	}
-	if (getline(stdin, line, sizeof (line)) == EOF)
+	if (getaline(stdin, line, sizeof (line)) == EOF)
 		errexit("\n");
 	(void) printf("\n");
 	if (line[0] == 'y' || line[0] == 'Y')
@@ -232,7 +229,7 @@
 }
 
 int32_t
-getline(FILE *fp, char *loc, int32_t maxlen)
+getaline(FILE *fp, char *loc, int32_t maxlen)
 {
 	int n;
 	register char *p, *lastloc;
@@ -337,7 +334,7 @@
 		return;
 	if (bp->b_errs != 0)
 		pfatal(gettext("WRITING ZERO'ED BLOCK %d TO DISK\n"),
-			bp->b_bno);
+		    bp->b_bno);
 	bp->b_dirty = 0;
 	bp->b_errs = 0;
 	bwrite(fd, bp->b_un.b_buf, bp->b_bno, (long)bp->b_size);
@@ -370,7 +367,7 @@
 	pbp = pdirbp = NULL;
 	if (bufhead.b_size != cnt)
 		errexit(gettext("Panic: lost %d buffers\n"),
-			bufhead.b_size - cnt);
+		    bufhead.b_size - cnt);
 	if (debug)
 		(void) printf("cache missed %ld of %ld (%ld%%)\n",
 		    diskreads, totalreads,
@@ -461,7 +458,7 @@
 	extern int returntosingle;
 
 	(void) printf(gettext("returning to single-user after filesystem "
-		"check\n"));
+	    "check\n"));
 	returntosingle = 1;
 	(void) signal(SIGQUIT, SIG_DFL);
 }
@@ -498,7 +495,7 @@
 
 	default:
 		errexit(gettext("UNKNOWN INODESC FIX MODE %d\n"),
-			idesc->id_fix);
+		    idesc->id_fix);
 	}
 	/* NOTREACHED */
 }
@@ -535,7 +532,7 @@
 				continue;
 			if (device_stat.st_rdev == mount_stat.st_dev) {
 				(void) strncpy(mnt.mnt_mountp, mountpoint,
-					sizeof (mountpoint));
+				    sizeof (mountpoint));
 				if (hasmntopt(&mnt, MNTOPT_RO) != 0)
 					found = 2;	/* mounted as RO */
 				else

--- a/usr/src/cmd/fs.d/ufs/fsck/utilities.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/fs.d/ufs/fsck/utilities.c	Thu Aug 12 14:55:22 2010 -0700
@@ -1,6 +1,5 @@
 /*
- * 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.
  */
 
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -70,7 +69,7 @@
 static struct mnttab *search_mnttab(caddr_t, caddr_t, caddr_t, size_t);
 static struct vfstab *search_vfstab(caddr_t, caddr_t, caddr_t, size_t);
 static void vpwarn(caddr_t, va_list);
-static int getline(FILE *, caddr_t, int);
+static int getaline(FILE *, caddr_t, int);
 static struct bufarea *alloc_bufarea(void);
 static void rwerror(caddr_t, diskaddr_t, int rval);
 static void debugclean(void);
@@ -156,7 +155,7 @@
 		return (1);
 	}
 	(void) fflush(stdout);
-	if (getline(stdin, line, sizeof (line)) == EOF)
+	if (getaline(stdin, line, sizeof (line)) == EOF)
 		errexit("\n");
 	(void) printf("\n");
 	if (line[0] == 'y' || line[0] == 'Y') {
@@ -167,7 +166,7 @@
 }
 
 int
-getline(FILE *fp, caddr_t loc, int maxlen)
+getaline(FILE *fp, caddr_t loc, int maxlen)
 {
 	int n;
 	caddr_t p, lastloc;

--- a/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,9 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2009 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	*/
@@ -420,7 +420,7 @@
 static void unblock_sigint(sigset_t *old_mask);
 static void recover_from_sigint(int signum);
 static int confirm_abort(void);
-static int getline(FILE *fp, char *loc, int maxlen);
+static int getaline(FILE *fp, char *loc, int maxlen);
 static void flush_writes(void);
 static long compute_maxcpg(long, long, long, long, long);
 static int in_64bit_mode(void);
@@ -5498,7 +5498,7 @@
 	    "you will be given instructions on how to\nrecover "
 	    "the filesystem.  Do you wish to cancel the filesystem "
 	    "grow\noperation (y/n)?"));
-	if (getline(stdin, line, sizeof (line)) == EOF)
+	if (getaline(stdin, line, sizeof (line)) == EOF)
 		line[0] = 'y';
 
 	printf("\n");
@@ -5510,7 +5510,7 @@
 }
 
 static int
-getline(FILE *fp, char *loc, int maxlen)
+getaline(FILE *fp, char *loc, int maxlen)
 {
 	int n;
 	char *p, *lastloc;

--- a/usr/src/cmd/idmap/idmap/idmap.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/idmap/idmap/idmap.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,11 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
@@ -1607,23 +1607,6 @@
 }
 
 /*
- * The same as strdup, but length chars is duplicated, no matter on
- * '\0'. The caller must guarantee "length" chars in "from".
- */
-static char *
-strndup(char *from, size_t length)
-{
-	char *out = (char *)malloc(length + 1);
-	if (out == NULL) {
-		print_error(NULL, gettext("Not enough memory\n"));
-		return (NULL);
-	}
-	(void) strncpy(out, from, length);
-	out[length] = '\0';
-	return (out);
-}
-
-/*
  * Convert pid from string to it's numerical representation. If it is
  * a valid string, i.e. number of a proper length, return 1. Otherwise
  * print an error message and return 0.

--- a/usr/src/cmd/ipf/lib/common/getline.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/ipf/lib/common/getline.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,17 +18,14 @@
  * Similar to fgets(3) but can handle '\\' and NL is converted to NUL.
  * Returns NULL if error occured, EOF encounterd or input line is too long.
  */
-char *getline(str, size, file, linenum)
-register char	*str;
-size_t	size;
-FILE	*file;
-int	*linenum;
+char *
+getaline(char *str, size_t size, FILE *file, int *linenum)
 {
 	char *p;
 	int s, len;
 
 	do {
-		for (p = str, s = size;; p += (len - 1), s -= (len - 1)) {
+		for (p = str, s = size; ; p += (len - 1), s -= (len - 1)) {
 			/*
 			 * if an error occured, EOF was encounterd, or there
 			 * was no room to put NUL, return NULL.

--- a/usr/src/cmd/ldap/common/ldaptest.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/ldap/common/ldaptest.c	Thu Aug 12 14:55:22 2010 -0700
@@ -1,12 +1,7 @@
 /*
- *
- * Portions Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
@@ -40,7 +35,7 @@
 char *dnsuffix;
 
 static char *
-getline( char *line, int len, FILE *fp, char *prompt )
+getaline( char *line, int len, FILE *fp, char *prompt )
 {
 	printf(prompt);
 
@@ -62,7 +57,7 @@
 	num = 0;
 	result = (char **) 0;
 	while ( 1 ) {
-		getline( buf, sizeof(buf), stdin, prompt );
+		getaline( buf, sizeof(buf), stdin, prompt );
 
 		if ( *buf == '\0' )
 			break;
@@ -161,14 +156,14 @@
 	result = NULL;
 	while ( 1 ) {
 		if ( prompt1 ) {
-			getline( buf, sizeof(buf), stdin, prompt1 );
+			getaline( buf, sizeof(buf), stdin, prompt1 );
 			tmp.mod_op = atoi( buf );
 
 			if ( tmp.mod_op == -1 || buf[0] == '\0' )
 				break;
 		}
 
-		getline( buf, sizeof(buf), stdin, prompt2 );
+		getaline( buf, sizeof(buf), stdin, prompt2 );
 		if ( buf[0] == '\0' )
 			break;
 		tmp.mod_type = strdup( buf );
@@ -229,7 +224,7 @@
 
 	if ( !freeit ) {
 #ifdef KERBEROS
-		getline( dn, sizeof(dn), stdin,
+		getaline( dn, sizeof(dn), stdin,
 		    "re-bind method (0->simple, 1->krbv41, 2->krbv42, 3->krbv41&2)? " );
 		if (( *authmethodp = atoi( dn )) == 3 ) {
 			*authmethodp = LDAP_AUTH_KRBV4;
@@ -240,12 +235,12 @@
 		*authmethodp = LDAP_AUTH_SIMPLE;
 #endif /* KERBEROS */
 
-		getline( dn, sizeof(dn), stdin, "re-bind dn? " );
+		getaline( dn, sizeof(dn), stdin, "re-bind dn? " );
 		strcat( dn, dnsuffix );
 		*dnp = dn;
 
 		if ( *authmethodp == LDAP_AUTH_SIMPLE && dn[0] != '\0' ) {
-			getline( passwd, sizeof(passwd), stdin,
+			getaline( passwd, sizeof(passwd), stdin,
 			    "re-bind password? " );
 		} else {
 			passwd[0] = '\0';
@@ -394,7 +389,7 @@
 	timelimit.tv_usec = 0;
 	
 	(void) memset( line, '\0', sizeof(line) );
-	while ( getline( line, sizeof(line), stdin, "\ncommand? " ) != NULL ) {
+	while ( getaline( line, sizeof(line), stdin, "\ncommand? " ) != NULL ) {
 		command1 = line[0];
 		command2 = line[1];
 		command3 = line[2];
@@ -403,7 +398,7 @@
 		case 'a':	/* add or abandon */
 			switch ( command2 ) {
 			case 'd':	/* add */
-				getline( dn, sizeof(dn), stdin, "dn? " );
+				getaline( dn, sizeof(dn), stdin, "dn? " );
 				strcat( dn, dnsuffix );
 				if ( (attrs = get_modlist( NULL, "attr? ",
 				    "value? " )) == NULL )
@@ -424,7 +419,7 @@
 				break;
 
 			case 'b':	/* abandon */
-				getline( line, sizeof(line), stdin, "msgid? " );
+				getaline( line, sizeof(line), stdin, "msgid? " );
 				id = atoi( line );
 				if ( ldap_abandon( ld, id ) != 0 )
 					ldap_perror( ld, "ldap_abandon" );
@@ -438,17 +433,17 @@
 
 		case 'b':	/* asynch bind */
 #ifdef KERBEROS
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 			    "method (0->simple, 1->krbv41, 2->krbv42)? " );
 			method = atoi( line ) | 0x80;
 #else /* KERBEROS */
 			method = LDAP_AUTH_SIMPLE;
 #endif /* KERBEROS */
-			getline( dn, sizeof(dn), stdin, "dn? " );
+			getaline( dn, sizeof(dn), stdin, "dn? " );
 			strcat( dn, dnsuffix );
 
 			if ( method == LDAP_AUTH_SIMPLE && dn[0] != '\0' )
-				getline( passwd, sizeof(passwd), stdin,
+				getaline( passwd, sizeof(passwd), stdin,
 				    "password? " );
 			else
 				passwd[0] = '\0';
@@ -464,7 +459,7 @@
 
 		case 'B':	/* synch bind */
 #ifdef KERBEROS
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 			    "method 0->simple 1->krbv41 2->krbv42 3->krb? " );
 			method = atoi( line );
 			if ( method == 3 )
@@ -472,12 +467,12 @@
 			else
 				method = method | 0x80;
 #else /* KERBEROS */
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 					 "method 0->simple, 1->SASL? ");
 			method = atoi (line);
 			if (method == 1){
 				method = LDAP_AUTH_SASL;
-				getline( line, sizeof(line), stdin,
+				getaline( line, sizeof(line), stdin,
 						 "mechanism 0->CRAM_MD5, 1->TLS? ");
 				theInt = atoi(line);
 				if (theInt == 0){
@@ -491,11 +486,11 @@
 			}
 			
 #endif /* KERBEROS */
-			getline( dn, sizeof(dn), stdin, "dn? " );
+			getaline( dn, sizeof(dn), stdin, "dn? " );
 			strcat( dn, dnsuffix );
 
 			if ( dn[0] != '\0' )
-				getline( passwd, sizeof(passwd), stdin,
+				getaline( passwd, sizeof(passwd), stdin,
 				    "password? " );
 			else
 				passwd[0] = '\0';
@@ -531,10 +526,10 @@
 			break;
 
 		case 'c':	/* compare */
-			getline( dn, sizeof(dn), stdin, "dn? " );
+			getaline( dn, sizeof(dn), stdin, "dn? " );
 			strcat( dn, dnsuffix );
-			getline( attr, sizeof(attr), stdin, "attr? " );
-			getline( value, sizeof(value), stdin, "value? " );
+			getaline( attr, sizeof(attr), stdin, "attr? " );
+			getaline( value, sizeof(value), stdin, "value? " );
 
 			if (ldap_get_option(ld, LDAP_OPT_PROTOCOL_VERSION, &i) == LDAP_SUCCESS && i == LDAP_VERSION3){
 				bv.bv_val = value;
@@ -553,7 +548,7 @@
 
 		case 'd':	/* turn on debugging */
 #ifdef LDAP_DEBUG
-			getline( line, sizeof(line), stdin, "debug level? " );
+			getaline( line, sizeof(line), stdin, "debug level? " );
 			ldap_debug = atoi( line );
 			if ( ldap_debug & LDAP_DEBUG_PACKETS ) {
 				lber_debug = ldap_debug;
@@ -564,7 +559,7 @@
 			break;
 
 		case 'E':	/* explode a dn */
-			getline( line, sizeof(line), stdin, "dn? " );
+			getaline( line, sizeof(line), stdin, "dn? " );
 			exdn = ldap_explode_dn( line, 0 );
 			for ( i = 0; exdn != NULL && exdn[i] != NULL; i++ ) {
 				printf( "\t%s\n", exdn[i] );
@@ -572,19 +567,19 @@
 			break;
 
 		case 'g':	/* set next msgid */
-			getline( line, sizeof(line), stdin, "msgid? " );
+			getaline( line, sizeof(line), stdin, "msgid? " );
 			ld->ld_msgid = atoi( line );
 			break;
 
 		case 'v':	/* set version number */
-			getline( line, sizeof(line), stdin, "version? " );
+			getaline( line, sizeof(line), stdin, "version? " );
 			theInt = atoi(line);
 			ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &theInt);
 			break;
 
 		case 'm':	/* modify or modifyrdn */
 			if ( strncmp( line, "modify", 4 ) == 0 ) {
-				getline( dn, sizeof(dn), stdin, "dn? " );
+				getaline( dn, sizeof(dn), stdin, "dn? " );
 				strcat( dn, dnsuffix );
 				if ( (mods = get_modlist(
 				    "mod (0=>add, 1=>delete, 2=>replace -1=>done)? ",
@@ -604,10 +599,10 @@
 						printf( "Modify initiated with id %d\n", id );
 				}
 			} else if ( strncmp( line, "modrdn", 4 ) == 0 ) {
-				getline( dn, sizeof(dn), stdin, "dn? " );
+				getaline( dn, sizeof(dn), stdin, "dn? " );
 				strcat( dn, dnsuffix );
-				getline( rdn, sizeof(rdn), stdin, "newrdn? " );
-				getline( line, sizeof(line), stdin, "delete old rdn (0=>no, 1=>yes)?");
+				getaline( rdn, sizeof(rdn), stdin, "newrdn? " );
+				getaline( line, sizeof(line), stdin, "delete old rdn (0=>no, 1=>yes)?");
 				delrdn = atoi(line);
 				if (ldap_get_option(ld, LDAP_OPT_PROTOCOL_VERSION, &i) == LDAP_SUCCESS && i == LDAP_VERSION3){
 					if ((err = ldap_rename(ld, dn, rdn, NULL, delrdn, NULL,NULL, &id)) != LDAP_SUCCESS){
@@ -640,13 +635,13 @@
 		case 'r':	/* result or remove */
 			switch ( command3 ) {
 			case 's':	/* result */
-				getline( line, sizeof(line), stdin,
+				getaline( line, sizeof(line), stdin,
 				    "msgid (-1=>any)? " );
 				if ( line[0] == '\0' )
 					id = -1;
 				else
 					id = atoi( line );
-				getline( line, sizeof(line), stdin,
+				getaline( line, sizeof(line), stdin,
 				    "all (0=>any, 1=>all)? " );
 				if ( line[0] == '\0' )
 					all = 1;
@@ -667,7 +662,7 @@
 				break;
 
 			case 'm':	/* remove */
-				getline( dn, sizeof(dn), stdin, "dn? " );
+				getaline( dn, sizeof(dn), stdin, "dn? " );
 				strcat( dn, dnsuffix );
 				if (ldap_get_option(ld, LDAP_OPT_PROTOCOL_VERSION, &i) == LDAP_SUCCESS && i == LDAP_VERSION3){
 					if ((err = ldap_delete_ext( ld, dn, NULL, NULL, &id )) != LDAP_SUCCESS )
@@ -689,21 +684,21 @@
 			break;
 
 		case 's':	/* search */
-			getline( dn, sizeof(dn), stdin, "searchbase? " );
+			getaline( dn, sizeof(dn), stdin, "searchbase? " );
 			strcat( dn, dnsuffix );
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 			    "scope (0=Base, 1=One Level, 2=Subtree)? " );
 			scope = atoi( line );
-			getline( filter, sizeof(filter), stdin,
+			getaline( filter, sizeof(filter), stdin,
 			    "search filter (e.g. sn=jones)? " );
 			types = get_list( "attrs to return? " );
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 			    "attrsonly (0=attrs&values, 1=attrs only)? " );
 			attrsonly = atoi( line );
 
 			if ( cldapflg ) {
 #ifdef CLDAP
-			    getline( line, sizeof(line), stdin,
+			    getaline( line, sizeof(line), stdin,
 				"Requestor DN (for logging)? " );
 			    if ( cldap_search_s( ld, dn, scope, filter, types,
 				    attrsonly, &res, line ) != 0 ) {
@@ -719,7 +714,7 @@
 				theInt = 0;
 				if (ldap_get_option(ld, LDAP_OPT_PROTOCOL_VERSION, &i) == LDAP_SUCCESS && i == LDAP_VERSION3){
 					resultusetimelimit = 1;
-					getline( line, sizeof(line), stdin,
+					getaline( line, sizeof(line), stdin,
 							 "ldap_search_ext (0=>no, 1=>yes - default: yes)? " );
 					if (line[0] == '\0')
 						theInt = 1;
@@ -727,10 +722,10 @@
 						theInt = atoi( line );
 				}
 				if (theInt){
-					getline(line, sizeof(line), stdin, "time limit?");
+					getaline(line, sizeof(line), stdin, "time limit?");
 					timelimit.tv_sec = atoi(line);
 					resultusetimelimit = 1;
-					getline(line, sizeof(line), stdin, "size limit?");
+					getaline(line, sizeof(line), stdin, "size limit?");
 					sizelimit = atoi(line);
 					if (( err = ldap_search_ext(ld, dn, scope, filter, types, attrsonly, NULL, NULL,
 												&timelimit, sizelimit, &id)) != LDAP_SUCCESS){
@@ -751,20 +746,20 @@
 			break;
 
 		case 't':	/* set timeout value */
-			getline( line, sizeof(line), stdin, "timeout? " );
+			getaline( line, sizeof(line), stdin, "timeout? " );
 			timeout.tv_sec = atoi( line );
 			break;
 
 		case 'U':	/* set ufn search prefix */
-			getline( line, sizeof(line), stdin, "ufn prefix? " );
+			getaline( line, sizeof(line), stdin, "ufn prefix? " );
 			ldap_ufn_setprefix( ld, line );
 			break;
 
 		case 'u':	/* user friendly search w/optional timeout */
-			getline( dn, sizeof(dn), stdin, "ufn? " );
+			getaline( dn, sizeof(dn), stdin, "ufn? " );
 			strcat( dn, dnsuffix );
 			types = get_list( "attrs to return? " );
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 			    "attrsonly (0=attrs&values, 1=attrs only)? " );
 			attrsonly = atoi( line );
 
@@ -787,10 +782,10 @@
 			break;
 
 		case 'l':	/* URL search */
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 			    "attrsonly (0=attrs&values, 1=attrs only)? " );
 			attrsonly = atoi( line );
-			getline( line, sizeof(line), stdin, "LDAP URL? " );
+			getaline( line, sizeof(line), stdin, "LDAP URL? " );
 			if (( id = ldap_url_search( ld, line, attrsonly  ))
 				== -1 ) {
 			    ldap_perror( ld, "ldap_url_search" );
@@ -800,7 +795,7 @@
 			break;
 
 		case 'p':	/* parse LDAP URL */
-			getline( line, sizeof(line), stdin, "LDAP URL? " );
+			getaline( line, sizeof(line), stdin, "LDAP URL? " );
 			if (( i = ldap_url_parse( line, &ludp )) != 0 ) {
 			    fprintf( stderr, "ldap_url_parse: error %d\n", i );
 			} else {
@@ -842,7 +837,7 @@
 			    break;
 
 		case 'n':	/* set dn suffix, for convenience */
-			getline( line, sizeof(line), stdin, "DN suffix? " );
+			getaline( line, sizeof(line), stdin, "DN suffix? " );
 			strcpy( dnsuffix, line );
 			break;
 
@@ -850,9 +845,9 @@
 #ifdef NO_CACHE
 			printf( NOCACHEERRMSG );
 #else /* NO_CACHE */
-			getline( line, sizeof(line), stdin, "Cache timeout (secs)? " );
+			getaline( line, sizeof(line), stdin, "Cache timeout (secs)? " );
 			i = atoi( line );
-			getline( line, sizeof(line), stdin, "Maximum memory to use (bytes)? " );
+			getaline( line, sizeof(line), stdin, "Maximum memory to use (bytes)? " );
 			if ( ldap_enable_cache( ld, i, atoi( line )) == 0 ) {
 				printf( "local cache is on\n" ); 
 			} else {
@@ -865,7 +860,7 @@
 #ifdef NO_CACHE
 			printf( NOCACHEERRMSG );
 #else /* NO_CACHE */
-			getline( line, sizeof(line), stdin, "DN? " );
+			getaline( line, sizeof(line), stdin, "DN? " );
 			ldap_uncache_entry( ld, line );
 #endif /* NO_CACHE */
 			break;
@@ -874,33 +869,33 @@
 #ifdef NO_CACHE
 			printf( NOCACHEERRMSG );
 #else /* NO_CACHE */
-			getline( line, sizeof(line), stdin, "request msgid? " );
+			getaline( line, sizeof(line), stdin, "request msgid? " );
 			ldap_uncache_request( ld, atoi( line ));
 #endif /* NO_CACHE */
 			break;
 
 		case 'o':	/* set ldap options */
-			getline( line, sizeof(line), stdin, "alias deref (0=never, 1=searching, 2=finding, 3=always)?" );
+			getaline( line, sizeof(line), stdin, "alias deref (0=never, 1=searching, 2=finding, 3=always)?" );
 			theInt = atoi(line);
 			ldap_set_option(ld, LDAP_OPT_DEREF, &theInt );
-			getline( line, sizeof(line), stdin, "timelimit?" );
+			getaline( line, sizeof(line), stdin, "timelimit?" );
 			theInt = atoi(line);
 			ldap_set_option(ld, LDAP_OPT_TIMELIMIT,  &theInt);
-			getline( line, sizeof(line), stdin, "sizelimit?" );
+			getaline( line, sizeof(line), stdin, "sizelimit?" );
 			theInt = atoi(line);
 			ldap_set_option(ld, LDAP_OPT_SIZELIMIT, &theInt);
 
 			ld->ld_options = 0;
 
 #ifdef STR_TRANSLATION
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 				"Automatic translation of T.61 strings (0=no, 1=yes)?" );
 			if ( atoi( line ) == 0 ) {
 				ld->ld_lberoptions &= ~LBER_TRANSLATE_STRINGS;
 			} else {
 				ld->ld_lberoptions |= LBER_TRANSLATE_STRINGS;
 #ifdef LDAP_CHARSET_8859
-				getline( line, sizeof(line), stdin,
+				getaline( line, sizeof(line), stdin,
 					"Translate to/from ISO-8859 (0=no, 1=yes?" );
 				if ( atoi( line ) != 0 ) {
 					ldap_set_string_translators( ld,
@@ -912,18 +907,18 @@
 #endif /* STR_TRANSLATION */
 
 #ifdef LDAP_DNS
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 				"Use DN & DNS to determine where to send requests (0=no, 1=yes)?" );
 			if ( atoi( line ) != 0 ) {
 				ld->ld_options |= LDAP_OPT_DNS;
 			}
 #endif /* LDAP_DNS */
 
-			getline( line, sizeof(line), stdin,
+			getaline( line, sizeof(line), stdin,
 				"Recognize and chase referrals (0=no, 1=yes)?" );
 			if ( atoi( line ) != 0 ) {
 				theInt = LDAP_OPT_ON;
-				getline( line, sizeof(line), stdin,
+				getaline( line, sizeof(line), stdin,
 						 "Prompt for bind credentials when chasing referrals (0=no, 1=yes)?" );
 				if ( atoi( line ) != 0 ) {
 					ldap_set_option( ld, LDAP_OPT_REBIND_FN, bind_prompt );
@@ -935,7 +930,7 @@
 			break;
 
 		case 'k': /* Set some controls */
-			getline( line, sizeof(line), stdin, 
+			getaline( line, sizeof(line), stdin, 
 					 "Set control: (0 for none, 1 for ManageDSA, 2 for preferredLang, 3 for BAD)?");
 			theInt = atoi(line);
 			switch (theInt){
@@ -949,7 +944,7 @@
 				ldap_set_option(ld, LDAP_OPT_SERVER_CONTROLS, ctrls);
 				break;
 			case 2:
-				getline( line, sizeof(line), stdin,
+				getaline( line, sizeof(line), stdin,
 						 "Preferred Language Control : lang ?");
 				aCtrl.ldctl_oid = "1.3.6.1.4.1.1466.20035";
 				aCtrl.ldctl_iscritical = 1;
@@ -959,7 +954,7 @@
 				ldap_set_option(ld, LDAP_OPT_SERVER_CONTROLS, ctrls);
 				break;
 			default:
-				getline( line, sizeof(line), stdin,
+				getaline( line, sizeof(line), stdin,
 						 "Bad Control is critical (0=false, 1=true)?");
 				aCtrl.ldctl_oid = "1.1.1.1.1.1";
 				aCtrl.ldctl_iscritical = atoi(line);
@@ -973,7 +968,7 @@
 #ifdef NO_CACHE
 			printf( NOCACHEERRMSG );
 #else /* NO_CACHE */
-			getline( line, sizeof(line), stdin, "cache errors (0=smart, 1=never, 2=always)?" );
+			getaline( line, sizeof(line), stdin, "cache errors (0=smart, 1=never, 2=always)?" );
 			switch( atoi( line )) {
 			case 0:
 				ldap_set_cache_options( ld, 0 );

--- a/usr/src/cmd/mail/copymt.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/mail/copymt.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,14 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 	/* SVr4.0 2.1	*/
 /*
     NAME
 	copymt - copy mail (f1) to temp (f2)
@@ -62,7 +64,7 @@
 		nextadr = let[nlet].adr;
 	}
 
-	while ((n = getline(line, sizeof line, f1)) > 0) {
+	while ((n = getaline(line, sizeof line, f1)) > 0) {
 		if (!newline) {
 			goto putout;
 		} else if ((hdr = isheader (line, &ctf)) == FALSE) {

--- a/usr/src/cmd/mail/gethead.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/mail/gethead.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,16 +18,14 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "mail.h"
 
 #define	MAXHDRSIZE	100	/* Maximum length of header line */
@@ -129,7 +126,8 @@
 		}
 
 		/* skip past trailing white space after header tag */
-		for (rc = 5; wline[rc] == ' ' || wline[rc] == '\t'; ++rc);
+		for (rc = 5; wline[rc] == ' ' || wline[rc] == '\t'; ++rc)
+			;
 		(void) strlcpy(hold, wline + rc, MAXHDRSIZE);
 		fgets(wline, MAXHDRSIZE, file);
 
@@ -171,12 +169,15 @@
 		 * delimiting white space.
 		 */
 		for (; hold[rc] != '\0' && hold[rc] != ' ' &&
-		    hold[rc] != '\t'; ++rc);
-		for (; hold[rc] == ' ' || hold[rc] == '\t'; ++rc);
+		    hold[rc] != '\t'; ++rc)
+			;
+		for (; hold[rc] == ' ' || hold[rc] == '\t'; ++rc)
+			;
 
 		/* Get the date information. */
 		(void) strlcpy(wline, hold + rc, MAXHDRSIZE);
-		for (rc = 0; wline[rc] != '\0' && wline[rc] != '\n'; ++rc);
+		for (rc = 0; wline[rc] != '\0' && wline[rc] != '\n'; ++rc)
+			;
 		wline[rc] = '\0';
 
 		if (!flgh && current == ln) mark = '>';
@@ -224,7 +225,7 @@
  *	return number of bytes in length
  */
 int
-getline(char *ptr2line, int max, FILE *f)
+getaline(char *ptr2line, int max, FILE *f)
 {
 	int	i, ch;
 	for (i = 0; i < max-1 && (ch = getc(f)) != EOF; )
@@ -243,9 +244,9 @@
 	int fd = mkstemp(lettmp = tmpl);
 
 	if (fd < 0 || (tmpf = fdopen(fd, "w+")) == NULL) {
-	    fprintf(stderr,
+		fprintf(stderr,
 		    "%s: Can't open '%s', type: w+\n", program, lettmp);
-	    done(0);
+		done(0);
 	}
 }
 

--- a/usr/src/cmd/mail/mail.h	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/mail/mail.h	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,9 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -30,8 +29,6 @@
 #ifndef _MAIL_H
 #define	_MAIL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
  /*
   * All global externs defined here. All variables are initialized
   * in init.c
@@ -304,7 +301,7 @@
 extern	void	gendeliv(FILE *fp, int rc, char *name);
 extern	int	getcomment(char *s, char *q);
 extern	int	gethead(int	current, int all);
-extern	int	getline(char *ptr2line, int max, FILE *f);
+extern	int	getaline(char *ptr2line, int max, FILE *f);
 extern	int	getnumbr(char *s);
 extern	int	getsurr(FILE *fp, string *buf, int firstfield);
 extern	void	goback(int letnum);

--- a/usr/src/cmd/mail/sendmail.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/mail/sendmail.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,16 +18,13 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
 
 #include "mail.h"
 #include <sys/param.h>
@@ -160,7 +157,7 @@
 		}
 	}
 
-	while ((n = getline(line, sizeof (line), stdin)) > 0) {
+	while ((n = getaline(line, sizeof (line), stdin)) > 0) {
 		last1c = line[n-1];
 		if (pushrest) {
 			if (!wtmpf(line, n)) {
@@ -287,7 +284,7 @@
 	}
 
 	if (n == 1 && last1c == '\n') {	/* blank line -- suppress */
-		n = getline(buf, sizeof (buf), stdin);
+		n = getaline(buf, sizeof (buf), stdin);
 		if (n == 0 || (ttyf && !strncmp(buf, ".\n", 2))) {
 			/*
 			 * no content: put mime-version, content-type
@@ -385,7 +382,7 @@
 		}
 		count += n;
 		n = ttyf
-			? getline(buf, sizeof (buf), stdin)
+			? getaline(buf, sizeof (buf), stdin)
 			: fread(buf, 1, sizeof (buf), stdin);
 	}
 	setsig(SIGINT, saveint);

--- a/usr/src/cmd/mailx/collect.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/mailx/collect.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,15 +18,14 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1985, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
  * The Regents of the University of California
@@ -38,8 +36,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * mailx -- a modified version of a University of California at Berkeley
  *	mail program
@@ -244,7 +240,7 @@
 			hdrs = 0;
 			continue;
 		}
-		if ((nread = getline(linebuf,LINESIZE,stdin,&hasnulls)) == NULL) {
+		if ((nread = getaline(linebuf,LINESIZE,stdin,&hasnulls)) == NULL) {
 			if (intty && value("ignoreeof") != NOSTR) {
 				if (++eof > 35)
 					break;
@@ -1227,7 +1223,7 @@
    passed must be 1 larger than "size" for the trailing NUL byte.
  */
 int
-getline(char *line, int size, FILE *f, int *hasnulls)
+getaline(char *line, int size, FILE *f, int *hasnulls)
 {
 	register int i, ch;
 	for (i = 0; (i < size) && ((ch=getc(f)) != EOF); ) {

--- a/usr/src/cmd/mailx/hdr/def.h	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/mailx/hdr/def.h	Thu Aug 12 14:55:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1985, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
@@ -40,8 +39,6 @@
 #ifndef _MAILX_DEF_H
 #define	_MAILX_DEF_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -474,7 +471,7 @@
 extern off_t		fsize(FILE *iob);
 extern int		getfold(char *name);
 extern int	gethfield(register FILE *f, char linebuf[], register long rem);
-extern int	getline(char *line, int size, FILE *f, int *hasnulls);
+extern int	getaline(char *line, int size, FILE *f, int *hasnulls);
 extern int	getmessage(char *buf, int *vector, int flags);
 extern int	getmsglist(char *buf, int *vector, int flags);
 extern int	getname(uid_t uid, char namebuf[]);

--- a/usr/src/cmd/mailx/send.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/mailx/send.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -21,8 +20,7 @@
  */
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1985, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -38,8 +36,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "rcv.h"
 #include <locale.h>
 
@@ -96,7 +92,7 @@
 	lc = 0;
 	clearerr(obuf);
 	while (c > 0L) {
-		nread = getline(line, LINESIZE, ibuf, &unused);
+		nread = getaline(line, LINESIZE, ibuf, &unused);
 		c -= nread;
 		lc++;
 		if (ishead) {

--- a/usr/src/cmd/mdb/common/modules/libc/libc.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/mdb/common/modules/libc/libc.c	Thu Aug 12 14:55:22 2010 -0700
@@ -845,11 +845,12 @@
 	    prt_addr(uberdata.ulwp_replace_last, 1),
 	    prt_addr(uberdata.atforklist, 0));
 
-	HD("robustlocks           robustlist");
-	mdb_printf(OFFSTR "%s %s\n",
+	HD("robustlocks           robustlist            progname");
+	mdb_printf(OFFSTR "%s %s %s\n",
 	    OFFSET(robustlocks),
 	    prt_addr(uberdata.robustlocks, 1),
-	    prt_addr(uberdata.robustlist, 0));
+	    prt_addr(uberdata.robustlist, 1),
+	    prt_addr(uberdata.progname, 0));
 
 	HD("tdb_bootstrap         tdb_sync_addr_hash    tdb_'count tdb_'fail");
 	mdb_printf(OFFSTR "%s %s %-10d %d\n",

--- a/usr/src/cmd/more/more.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/more/more.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,9 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -39,8 +39,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  *      @(#) more.c 1.1 88/03/29 more:more.c
  */
@@ -224,7 +222,7 @@
 static void reset_tty(void);
 static void rdline(register FILE *f);
 static off_t command(char *filename, register FILE *f);
-static int getline(register FILE *f, int *length);
+static int getaline(register FILE *f, int *length);
 static int number(char *cmd);
 static int colon(char *filename, int cmd, off_t nlines);
 
@@ -504,7 +502,7 @@
 
     for (;;) {
         while (num_lines > 0 && !Pause) {
-            if ((nchars = getline (f, &length)) == EOF)
+            if ((nchars = getaline (f, &length)) == EOF)
             {
                 if (clreol) clreos();
                 return;
@@ -726,7 +724,7 @@
 */
 
 static int
-getline(register FILE *f, int *length)
+getaline(register FILE *f, int *length)
 {
     register int        c;
     register char       *p;

--- a/usr/src/cmd/ndmpd/ndmp/ndmpd_dtime.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/ndmpd/ndmp/ndmpd_dtime.c	Thu Aug 12 14:55:22 2010 -0700
@@ -184,12 +184,12 @@
 
 
 /*
- * getline
+ * getaline
  *
  * Get a line from the file and handle the continued lines.
  */
 static char *
-getline(FILE *fp, char *line, int llen)
+getaline(FILE *fp, char *line, int llen)
 {
 	char *save;
 	int len;
@@ -483,7 +483,7 @@
 		return (-1);
 
 	do {
-		if (getline(fp, tbuf, sizeof (tbuf)) != tbuf)
+		if (getaline(fp, tbuf, sizeof (tbuf)) != tbuf)
 			return (-1);
 	} while (!*tbuf);
 

--- a/usr/src/cmd/nscd/nscd_initf.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/nscd/nscd_initf.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,6 +18,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  */
@@ -236,10 +237,11 @@
 	_nss_initf_passwd_compat,
 	_nss_initf_group_compat,
 	/*
-	 * no initf() for pseudo-databases: passwd, shadow, user_attr,
-	 * and group (when called from the compat backend)
+	 * no initf() for pseudo-databases: passwd, shadow, audit_user,
+	 * user_attr, and group (when called from the compat backend)
 	 */
 	NULL,
 	NULL,
 	NULL,
+	NULL,
 	NULL};

--- a/usr/src/cmd/oawk/makeprctab.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/oawk/makeprctab.c	Thu Aug 12 14:55:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -85,7 +84,7 @@
 	{ BREAK, "jump", "break"},
 	{ CONTINUE, "jump", "continue"},
 	{ FNCN, "fncn", "fncn"},
-	{ GETLINE, "getline", "getline"},
+	{ GETLINE, "getaline", "getline"},
 	{ 0, ""},
 };
 #define	SIZE	LASTTOKEN - FIRSTTOKEN

--- a/usr/src/cmd/oawk/run.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/oawk/run.c	Thu Aug 12 14:55:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -156,7 +155,7 @@
 
 
 CELL *
-getline(void)
+getaline(void)
 {
 	CELL *x;
 

--- a/usr/src/cmd/pg/pg.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/pg/pg.c	Thu Aug 12 14:55:22 2010 -0700
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -91,7 +90,7 @@
 static	void	error(char *);
 static	void	terminit();
 static	void	compact();
-static	off_t	getline(FILE *);
+static	off_t	getaline(FILE *);
 static	int	mrdchar();
 static	off_t	find(int, off_t);
 static	int	search(char *, off_t);
@@ -159,7 +158,7 @@
 static	short	nfiles;
 static	char	*shell;
 static	char	*promptstr = ":";
-static  off_t	nchars;			/* return from getline in find() */
+static  off_t	nchars;			/* return from getaline in find() */
 static	jmp_buf	restore;
 static	char	Line[LINSIZ+2];
 
@@ -1369,7 +1368,7 @@
 		else
 			(void) fseeko(f, (off_t)dol->l_addr, SEEK_SET);
 		dot = dol - 1;
-		while ((nchars = getline(f)) != EOF) {
+		while ((nchars = getaline(f)) != EOF) {
 			dot++;
 			newdol(f);
 			if (where == dot->l_no || brk_hit)
@@ -1396,7 +1395,7 @@
 		} else {
 			dot = zero + where - 1;
 			(void) fseeko(f, (off_t)dot->l_addr, SEEK_SET);
-			nchars = getline(f);
+			nchars = getaline(f);
 			return (dot->l_no);
 		}
 	}
@@ -1416,7 +1415,7 @@
  */
 
 static off_t
-getline(f)
+getaline(f)
 FILE *f;
 {
 	char	*p;
@@ -1432,7 +1431,7 @@
 		rdchar = (int (*)())fgetwc;
 
 	fileptr = f;
-	/* copy overlap from previous call to getline */
+	/* copy overlap from previous call to getaline */
 	if (savlength)
 		(void) strncpy(Line, multic, (size_t)savlength);
 	for (column = 0, p = Line + savlength; ; ) {
@@ -1482,7 +1481,7 @@
 	if (c != '\n') { /* We're stopping in the middle of the line */
 		if (column != columns || !auto_right_margin)
 			*p++ = '\n';	/* for the display */
-		/* save overlap for next call to getline */
+		/* save overlap for next call to getaline */
 		savlength = length;
 		if (savlength == 0) {
 			/*

--- a/usr/src/cmd/picl/plugins/sun4u/blade/bsc/picllom.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/picl/plugins/sun4u/blade/bsc/picllom.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,13 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This plugin creates PICL nodes and properties for objects handled through
  * the blade support chip (BSC). The BSC Solaris land device driver exposes
@@ -102,7 +99,6 @@
 static	int		lookup_led_status(int8_t state, const char **string);
 static	int		read_led_status(ptree_rarg_t *parg, void *buf);
 static	void		convert_node_name(char *ptr);
-static const char	*strcasestr(const char *s1, const char *s2);
 static	int		add_temp_sensors(int lom_fd, picl_nodehdl_t lominfh);
 static	int		add_voltage_monitors(int lom_fd,
     picl_nodehdl_t lominfh);
@@ -300,7 +296,7 @@
 	char devices_path[PATH_MAX];
 
 	err = ptree_get_propval_by_name(*lominfh, PICL_PROP_DEVFS_PATH,
-		devfs_path, sizeof (devfs_path));
+	    devfs_path, sizeof (devfs_path));
 
 	/* Build up the full device path and set the global */
 	strcpy(devices_path, "/devices");
@@ -854,24 +850,6 @@
 	}
 }
 
-/*
- * find first occurrence of string s2 within string s1 (ignoring case)
- */
-static const char *
-strcasestr(const char *s1, const char *s2)
-{
-	int len1 = strlen(s1);
-	int len2 = strlen(s2);
-	int i;
-
-	for (i = 0; i <= len1 - len2; i++) {
-		if (strncasecmp(s1 + i, s2, len2) == 0)
-			return (s1 + i);
-	}
-
-	return (NULL);
-}
-
 static int
 add_temp_sensors(int lom_fd, picl_nodehdl_t lominfh)
 {
@@ -1060,10 +1038,10 @@
 	 */
 	if ((led_state->colour != LOM_LED_COLOUR_NONE) &&
 	    (led_state->colour != LOM_LED_COLOUR_ANY)) {
-	    err = add_regular_prop(ledh, PICL_PROP_COLOR,
-		PICL_PTYPE_CHARSTRING, PICL_READ,
-		colour_lkup[led_state->index].size,
-		colour_lkup[led_state->index].str_colour, &proph);
+		err = add_regular_prop(ledh, PICL_PROP_COLOR,
+		    PICL_PTYPE_CHARSTRING, PICL_READ,
+		    colour_lkup[led_state->index].size,
+		    colour_lkup[led_state->index].str_colour, &proph);
 	}
 	if (err != PICL_SUCCESS)
 		return;

--- a/usr/src/cmd/prctl/prctl.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/prctl/prctl.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,12 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-
 #include <unistd.h>
 #include <rctl.h>
 #include <libproc.h>
@@ -223,7 +222,7 @@
 
 	(void) setlocale(LC_ALL, "");
 	(void) textdomain(TEXT_DOMAIN);
-	(void) setprogname(argv[0]);
+	(void) setpname(argv[0]);
 
 	while ((opt = getopt(argc, argv, "sPp:Fd:e:i:n:rt:v:x")) != EOF) {
 

--- a/usr/src/cmd/prctl/utils.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/prctl/utils.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,13 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/param.h>
 #include <libintl.h>
 #include <string.h>
@@ -44,7 +42,7 @@
 static char *pname;
 
 char *
-setprogname(char *arg0)
+setpname(char *arg0)
 {
 	char *p = strrchr(arg0, '/');
 

--- a/usr/src/cmd/prctl/utils.h	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/prctl/utils.h	Thu Aug 12 14:55:22 2010 -0700
@@ -18,16 +18,14 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef	_UTILS_H
 #define	_UTILS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -35,7 +33,7 @@
 #include <sys/types.h>
 
 extern void warn(const char *, ...);
-extern char *setprogname(char *);
+extern char *setpname(char *);
 
 /*
  * scale_t

--- a/usr/src/cmd/prtconf/prtconf.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/prtconf/prtconf.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,6 +18,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
  */
@@ -25,7 +26,6 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved	*/
 
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -50,7 +50,7 @@
 #endif	/* __x86 */
 
 static void
-setprogname(const char *name)
+setpname(const char *name)
 {
 	char *p;
 
@@ -178,7 +178,7 @@
 	int c, ret;
 	char hw_provider[SYS_NMLN];
 
-	setprogname(argv[0]);
+	setpname(argv[0]);
 	opts.o_promdev = "/dev/openprom";
 
 	while ((c = getopt(argc, argv, optstring)) != -1)  {

--- a/usr/src/cmd/prtdiag/main.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/prtdiag/main.c	Thu Aug 12 14:55:22 2010 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -21,8 +20,7 @@
  */
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
@@ -30,8 +28,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <locale.h>
 #include <stdlib.h>
@@ -43,7 +39,7 @@
 extern int do_prominfo(int, char *, int, int);
 
 static char *
-setprogname(char *name)
+setpname(char *name)
 {
 	char	*p;
 
@@ -58,7 +54,7 @@
 {
 	int	c;
 	int	syserrlog = 0;
-	char	*progname = setprogname(argv[0]);
+	char	*progname = setpname(argv[0]);
 	int	print_flag = 1;
 	int	logging = 0;
 

--- a/usr/src/cmd/rcap/common/utils.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/rcap/common/utils.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,13 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/param.h>
 #include <libintl.h>
 #include <stdarg.h>
@@ -154,7 +152,7 @@
 }
 
 char *
-setprogname(char *arg0)
+setpname(char *arg0)
 {
 	char *p = strrchr(arg0, '/');
 

--- a/usr/src/cmd/rcap/common/utils.h	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/rcap/common/utils.h	Thu Aug 12 14:55:22 2010 -0700
@@ -18,16 +18,14 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef	_UTILS_H
 #define	_UTILS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <assert.h>
 #include <libintl.h>
 #include <stdarg.h>
@@ -93,7 +91,7 @@
 extern rcm_level_t get_message_priority(void);
 extern rcm_level_t set_message_priority(rcm_level_t);
 extern rcm_dst_t set_message_destination(rcm_dst_t);
-extern char *setprogname(char *);
+extern char *setpname(char *);
 extern void warn(const char *, ...);
 extern int valid_abspath(char *);
 extern void vdprintfe(int, const char *, va_list);

--- a/usr/src/cmd/rcap/rcapadm/rcapadm.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/rcap/rcapadm/rcapadm.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,13 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -129,7 +127,7 @@
 	else
 		(void) printf(gettext("                                      "
 		    "state: %s\n"), *persistent ? gettext("enabled") :
-			gettext("disabled"));
+		    gettext("disabled"));
 
 	(void) printf(gettext("           memory cap enforcement"
 	    " threshold: %d%%\n"), conf.rcfg_memory_cap_enforcement_pressure);
@@ -190,7 +188,7 @@
 	char *zonename;
 	char *maxrss = NULL;
 
-	(void) setprogname("rcapadm");
+	(void) setpname("rcapadm");
 	(void) setlocale(LC_ALL, "");
 	(void) textdomain(TEXT_DOMAIN);
 

--- a/usr/src/cmd/rcap/rcapd/rcapd_main.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/rcap/rcapd/rcapd_main.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,13 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * rcapd is a long-running daemon enforcing project-based resource caps (see
  * rcapd(1M)).  Each instance of a process aggregate (project or, generically,
@@ -1217,7 +1215,7 @@
 		if (fchmod(fd, 0644) == 0 && write(fd, &rs, sizeof (rs)) ==
 		    sizeof (rs)) {
 			list_walk_collection(report_collection_cb,
-				(void *)(intptr_t)fd);
+			    (void *)(intptr_t)fd);
 			/*
 			 * Replace the existing statistics file with this new
 			 * one.
@@ -1447,7 +1445,7 @@
 	hrtime_t next_rss_sample;	/* (latest) time of next RSS sample */
 
 	(void) set_message_priority(RCM_INFO);
-	(void) setprogname("rcapd");
+	(void) setpname("rcapd");
 	rcapd_pid = getpid();
 	(void) chdir("/");
 	should_run = 1;

--- a/usr/src/cmd/rcap/rcapstat/rcapstat.c	Thu Aug 12 14:07:03 2010 -0700
+++ b/usr/src/cmd/rcap/rcapstat/rcapstat.c	Thu Aug 12 14:55:22 2010 -0700
@@ -18,9 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <sys/types.h>
@@ -365,7 +365,7 @@
 
 	(void) setlocale(LC_ALL, "");
 	(void) textdomain(TEXT_DOMAIN);
-	(void) setprogname("rcapstat");
+	(void) setpname("rcapstat");
 
 	global = unformatted = 0;
 	while ((opt = getopt(argc, argv, "gpuzT:")) != (int)EOF) {