6272085 gcc and cmd/pg don't get along

6273811 gcc and cmd/rmdir don't get along
6273885 gcc and cmd/split don't get along
6273893 gcc and cmd/strings don't get along
6273915 gcc and cmd/tcopy don't get along
6273937 gcc and cmd/tr don't get along
6273938 gcc and cmd/tr_xpg4 don't get along
6273948 gcc and cmd/unlink don't get along

6 files changed, 36 insertions, 27 deletions

diff --git a/usr/src/cmd/pg/pg.c b/usr/src/cmd/pg/pg.c
index 56fd9a697f..d39c911908 100644
--- a/usr/src/cmd/pg/pg.c
+++ b/usr/src/cmd/pg/pg.c
@@ -19,15 +19,15 @@
  *
  * 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) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <signal.h>
@@ -187,9 +187,8 @@ static	off_t	eofl_no;	/* what the last line of the file is */
 static	void	usage(void);
 static FILE	*pg_stdin;
 
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char **argv)
 {
 	char	*s;
 	char	*p;
@@ -331,8 +330,7 @@ char *argv[];
 	while (fnum < nfiles) {
 		if (strcmp(fnames[fnum], "") == 0)
 			fnames[fnum] = "-";
-		if ((in_file = checkf(fnames[fnum])) == NULL)
-		{
+		if ((in_file = checkf(fnames[fnum])) == NULL) {
 			status = 2;
 			fnum++;
 		} else {
@@ -1090,7 +1088,7 @@ help()
 "\n"
 "See the manual page for more detail.\n"
 "-------------------------------------------------------\n"),
-		stdout);
+	    stdout);
 }
 
 /*
diff --git a/usr/src/cmd/rmdir/rmdir.c b/usr/src/cmd/rmdir/rmdir.c
index 15cc2be7f4..f515359715 100644
--- a/usr/src/cmd/rmdir/rmdir.c
+++ b/usr/src/cmd/rmdir/rmdir.c
@@ -47,7 +47,7 @@
 #include <locale.h>
 
 
-void
+int
 main(int argc, char **argv)
 {
 
@@ -189,5 +189,5 @@ main(int argc, char **argv)
 			continue;
 		}
 	}
-	exit(errno ? 2 : 0);
+	return (errno ? 2 : 0);
 }
diff --git a/usr/src/cmd/split/split.c b/usr/src/cmd/split/split.c
index 4202bfec40..6e0de2987b 100644
--- a/usr/src/cmd/split/split.c
+++ b/usr/src/cmd/split/split.c
@@ -19,14 +19,16 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved	*/
 
+/*
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
-/*	Portions Copyright (c) 1988,1996,1999 by Sun Microsystems, Inc. */
-/*	All Rights Reserved.					*/
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved	*/
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.6	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -58,7 +60,7 @@ static	void	next_file_name();
 static	char	*progname;
 static	int	suffix_length = 2;
 
-
+int
 main(int argc, char **argv)
 {
 	long long	line_count = 0;
@@ -215,7 +217,7 @@ main(int argc, char **argv)
 		output_file_name = "x";
 
 	/* check options */
-	if (((int) strlen(output_file_name) + suffix_length) > FILENAME_MAX) {
+	if (((int)strlen(output_file_name) + suffix_length) > FILENAME_MAX) {
 		(void) fprintf(stderr, gettext(
 		"%s: Output file name too long\n"), progname);
 		return (1);
@@ -245,7 +247,7 @@ main(int argc, char **argv)
 	for (i = 0; output_file_name[i]; i++) {
 		fname[i] = output_file_name[i];
 	}
-	while (i < (int) strlen(output_file_name) + suffix_length) {
+	while (i < (int)strlen(output_file_name) + suffix_length) {
 		fname[i++] = 'a';
 	}
 	if (suffix_length)
@@ -347,7 +349,7 @@ main(int argc, char **argv)
 
 
 static	void
-next_file_name(char * name)
+next_file_name(char *name)
 {
 	int	i;
 
diff --git a/usr/src/cmd/strings/strings.c b/usr/src/cmd/strings/strings.c
index 3d2ee626ec..9a3065af34 100644
--- a/usr/src/cmd/strings/strings.c
+++ b/usr/src/cmd/strings/strings.c
@@ -96,7 +96,7 @@ static	char	*tbuf = NULL;
 static	size_t	buf_size = 0;
 static	int	rc = 0; /* exit code */
 
-
+int
 main(argc, argv)
 	int argc;
 	char *argv[];
diff --git a/usr/src/cmd/tcopy/tcopy.c b/usr/src/cmd/tcopy/tcopy.c
index 55024b9565..6fa3e50f3e 100644
--- a/usr/src/cmd/tcopy/tcopy.c
+++ b/usr/src/cmd/tcopy/tcopy.c
@@ -66,7 +66,7 @@ int
 main(argc, argv)
 char **argv;
 {
-	register n, nw, inp, outp;
+	int	n, nw, inp, outp;
 	struct mtop op;
 	size_t buf_size = size_64K;
 
@@ -181,7 +181,6 @@ char **argv;
 		(void) close(outp);
 	(void) printf("total length: %lld bytes\n", tsize);
 	return (0);
-	/* NOTREACHED */
 }
 
 void
diff --git a/usr/src/cmd/unlink/unlink.c b/usr/src/cmd/unlink/unlink.c
index 314e3a6a59..fa25b0fa96 100644
--- a/usr/src/cmd/unlink/unlink.c
+++ b/usr/src/cmd/unlink/unlink.c
@@ -19,15 +19,25 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.4	*/
+#include <stdlib.h>
+#include <unistd.h>
+#include <libintl.h>
 #include <locale.h>
 
-main(argc, argv) char *argv[]; {
-
+int
+main(int argc, char **argv)
+{
 	char *p;
 	int res = 0;
 
@@ -48,5 +58,5 @@ main(argc, argv) char *argv[]; {
 	if (res = unlink(argv[1]))
 		perror("unlink");
 
-	exit(res);
+	return (res);
 }