6264775 lpadmin expects to write into string constants

6271970 gcc and cmd/lp don't get along

6 files changed, 35 insertions, 32 deletions

diff --git a/usr/src/cmd/lp/model/drain.output.c b/usr/src/cmd/lp/model/drain.output.c
index 43fb1a369c..6a11c4713c 100644
--- a/usr/src/cmd/lp/model/drain.output.c
+++ b/usr/src/cmd/lp/model/drain.output.c
@@ -19,11 +19,15 @@
  *
  * 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  	*/
 
-
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.5	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "termio.h"
 
@@ -55,9 +59,8 @@ extern int		tidbit();
  ** main()
  **/
 
-int			main (argc, argv)
-	int			argc;
-	char			*argv[];
+int
+main(int argc, char *argv[])
 {
 	extern char		*getenv();
 
@@ -93,6 +96,5 @@ int			main (argc, argv)
 	if (sleep_time)
 		sleep (sleep_time);
 
-	exit (0);
-	/*NOTREACHED*/
+	return (0);
 }
diff --git a/usr/src/cmd/lp/model/lp.cat.c b/usr/src/cmd/lp/model/lp.cat.c
index 206fbfb36c..79ac77913d 100644
--- a/usr/src/cmd/lp/model/lp.cat.c
+++ b/usr/src/cmd/lp/model/lp.cat.c
@@ -20,14 +20,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1989-2002 Sun Microsystems, Inc.  All rights reserved.
+ * 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"
 
 #include "stdio.h"
@@ -396,11 +395,10 @@ int bpp_state(int);
  ** main()
  **/
 
-int			main (argc, argv)
-	int			argc;
-	char			*argv[];
+int
+main(int argc, char *argv[])
 {
-	register int		nin,
+	int			nin,
 				nout,
 				effective_rate,
 				max_delay	= 0,
@@ -641,8 +639,7 @@ gettext("Trouble identifying printer type \"%s\"; check the Terminfo database.\n
 
 	}
 
-	exit (E_SUCCESS);
-	/*NOTREACHED*/
+	return (E_SUCCESS);
 }
 
 /**
diff --git a/usr/src/cmd/lp/model/lp.set.c b/usr/src/cmd/lp/model/lp.set.c
index c3d6089912..e2748a0890 100644
--- a/usr/src/cmd/lp/model/lp.set.c
+++ b/usr/src/cmd/lp/model/lp.set.c
@@ -19,11 +19,15 @@
  *
  * 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  	*/
 
-
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.4	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "stdio.h"
 
@@ -36,9 +40,8 @@ extern char		*getenv();
  ** main()
  **/
 
-int			main (argc, argv)
-	int			argc;
-	char			*argv[];
+int
+main(int argc, char *argv[])
 {
 	static char		not_set[10]	= "H V W L S";
 
@@ -137,6 +140,5 @@ int			main (argc, argv)
 
 	fprintf (stderr, "%s\n", not_set);
 
-	exit (exit_code);
-	/*NOTREACHED*/
+	return (exit_code);
 }
diff --git a/usr/src/cmd/lp/model/lp.tell.c b/usr/src/cmd/lp/model/lp.tell.c
index e53c41be36..e58eb968b2 100644
--- a/usr/src/cmd/lp/model/lp.tell.c
+++ b/usr/src/cmd/lp/model/lp.tell.c
@@ -20,15 +20,14 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+ * 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"	/* SVr4.0 1.6	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "signal.h"
 #include "stdio.h"
@@ -130,9 +129,8 @@ char *ps_m54 = "cartridge out";
  ** main()
  **/
 
-int			main (argc, argv)
-	int			argc;
-	char			*argv[];
+int
+main(int argc, char *argv[])
 {
 	char			*alert_text,
 				buf[BUFSIZ],
@@ -438,6 +436,8 @@ int			main (argc, argv)
 		
 	}
 	done (0);
+
+	return (0);
 }
 
 /**
diff --git a/usr/src/cmd/lp/model/netpr/netpr.c b/usr/src/cmd/lp/model/netpr/netpr.c
index ffc13c97e4..ee2614b8f6 100644
--- a/usr/src/cmd/lp/model/netpr/netpr.c
+++ b/usr/src/cmd/lp/model/netpr/netpr.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1996-2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -45,6 +45,7 @@ static void usage_exit();
 static void pipehandler(int);
 char data_file_type = 0;
 
+int
 main(int argc, char *argv[])
 {
 	extern char *optarg;
diff --git a/usr/src/cmd/lp/model/netpr/netpr.h b/usr/src/cmd/lp/model/netpr/netpr.h
index f7dada2219..f155690a3c 100644
--- a/usr/src/cmd/lp/model/netpr/netpr.h
+++ b/usr/src/cmd/lp/model/netpr/netpr.h
@@ -19,8 +19,10 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1996,  by Sun Microsystems, Inc.	*/
-/*	All rights reserved.				*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
 #ifndef	_NETPR_H
 #define	_NETPR_H
@@ -144,7 +146,6 @@ struct np_bsdjob {
 	np_data_t	*np_data;
 };
 
-extern append_list(np_data_t *, np_bsdjob_t *);
 extern char * long2str(long, char *);
 extern void null_sighandler(int);
 extern int open_network(char *, int);