[Midnightbsd-cvs] src [10235] trunk/bin/stty: update

[laffer1 at midnightbsd.org]

Revision: 10235
          http://svnweb.midnightbsd.org/src/?rev=10235
Author:   laffer1
Date:     2018-06-02 12:13:46 -0400 (Sat, 02 Jun 2018)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/bin/stty/cchar.c
    trunk/bin/stty/extern.h
    trunk/bin/stty/modes.c

Modified: trunk/bin/stty/cchar.c
===================================================================
--- trunk/bin/stty/cchar.c	2018-06-02 16:13:01 UTC (rev 10234)
+++ trunk/bin/stty/cchar.c	2018-06-02 16:13:46 UTC (rev 10235)
@@ -34,7 +34,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/stty/cchar.c,v 1.14 2004/04/06 20:06:53 markm Exp $");
+__FBSDID("$FreeBSD: stable/10/bin/stty/cchar.c 127958 2004-04-06 20:06:54Z markm $");
 
 #include <sys/types.h>
 

Modified: trunk/bin/stty/extern.h
===================================================================
--- trunk/bin/stty/extern.h	2018-06-02 16:13:01 UTC (rev 10234)
+++ trunk/bin/stty/extern.h	2018-06-02 16:13:46 UTC (rev 10235)
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/stty/extern.h,v 1.10 2004/04/06 20:06:53 markm Exp $
+ * $FreeBSD: stable/10/bin/stty/extern.h 238508 2012-07-15 21:12:22Z jilles $
  */
 
 int	c_cchars(const void *, const void *);
@@ -41,6 +41,6 @@
 int	msearch(char ***, struct info *);
 void	optlist(void);
 void	print(struct termios *, struct winsize *, int, enum FMT);
-void	usage(void);
+void	usage(void) __dead2;
 
 extern struct cchar cchars1[], cchars2[];

Modified: trunk/bin/stty/modes.c
===================================================================
--- trunk/bin/stty/modes.c	2018-06-02 16:13:01 UTC (rev 10234)
+++ trunk/bin/stty/modes.c	2018-06-02 16:13:46 UTC (rev 10235)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/bin/stty/modes.c,v 1.2 2007/07/26 20:13:01 laffer1 Exp $ */
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/stty/modes.c,v 1.13 2004/04/06 20:06:53 markm Exp $");
+__FBSDID("$FreeBSD: stable/10/bin/stty/modes.c 228406 2011-12-11 09:56:48Z ed $");
 
 #include <sys/types.h>
 #include <stddef.h>
@@ -53,7 +53,7 @@
  * The code in optlist() depends on minus options following regular
  * options, i.e. "foo" must immediately precede "-foo".
  */
-struct modes cmodes[] = {
+static const struct modes cmodes[] = {
 	{ "cs5",	CS5, CSIZE },
 	{ "cs6",	CS6, CSIZE },
 	{ "cs7",	CS7, CSIZE },
@@ -95,7 +95,7 @@
 	{ NULL,		0, 0 },
 };
 
-struct modes imodes[] = {
+static const struct modes imodes[] = {
 	{ "ignbrk",	IGNBRK, 0 },
 	{ "-ignbrk",	0, IGNBRK },
 	{ "brkint",	BRKINT, 0 },
@@ -131,7 +131,7 @@
 	{ NULL,		0, 0 },
 };
 
-struct modes lmodes[] = {
+static const struct modes lmodes[] = {
 	{ "echo",	ECHO, 0 },
 	{ "-echo",	0, ECHO },
 	{ "echoe",	ECHOE, 0 },
@@ -183,7 +183,7 @@
 	{ NULL,		0, 0 },
 };
 
-struct modes omodes[] = {
+static const struct modes omodes[] = {
 	{ "opost",	OPOST, 0 },
 	{ "-opost",	0, OPOST },
 	{ "litout",	0, OPOST },
@@ -210,7 +210,7 @@
 int
 msearch(char ***argvp, struct info *ip)
 {
-	struct modes *mp;
+	const struct modes *mp;
 	char *name;
 
 	name = **argvp;