stty header cleanup

[Edgar Pettijohn]

Index: cchar.c
===
RCS file: /cvs/src/bin/stty/cchar.c,v
retrieving revision 1.11
diff -u -p -u -r1.11 cchar.c
--- cchar.c27 Oct 2009 23:59:22 -1.11
+++ cchar.c16 Mar 2016 23:53:58 -
@@ -30,6 +30,7 @@
  * SUCH DAMAGE.
  */

+#include 
 #include 

 #include 
@@ -37,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 

 #include "stty.h"
 #include "extern.h"
Index: gfmt.c
===
RCS file: /cvs/src/bin/stty/gfmt.c,v
retrieving revision 1.8
diff -u -p -u -r1.8 gfmt.c
--- gfmt.c28 Oct 2009 07:12:59 -1.8
+++ gfmt.c16 Mar 2016 23:54:29 -
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 

 #include "stty.h"
 #include "extern.h"
Index: key.c
===
RCS file: /cvs/src/bin/stty/key.c,v
retrieving revision 1.16
diff -u -p -u -r1.16 key.c
--- key.c20 Nov 2015 15:57:39 -1.16
+++ key.c16 Mar 2016 23:55:51 -
@@ -30,14 +30,16 @@
  * SUCH DAMAGE.
  */

+#include 
 #include 

 #include 
 #include 
-#include 
 #include 
 #include 
+#include 
 #include 
+#include 

 #include "stty.h"
 #include "extern.h"
Index: modes.c
===
RCS file: /cvs/src/bin/stty/modes.c,v
retrieving revision 1.10
diff -u -p -u -r1.10 modes.c
--- modes.c27 Oct 2009 23:59:22 -1.10
+++ modes.c16 Mar 2016 23:56:40 -
@@ -31,8 +31,11 @@
  */

 #include 
+
 #include 
 #include 
+#include 
+
 #include "stty.h"
 #include "extern.h"

Index: print.c
===
RCS file: /cvs/src/bin/stty/print.c,v
retrieving revision 1.13
diff -u -p -u -r1.13 print.c
--- print.c27 Oct 2009 23:59:22 -1.13
+++ print.c16 Mar 2016 23:57:24 -
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 

 #include "stty.h"
 #include "extern.h"
Index: stty.c
===
RCS file: /cvs/src/bin/stty/stty.c,v
retrieving revision 1.18
diff -u -p -u -r1.18 stty.c
--- stty.c20 Nov 2015 15:58:28 -1.18
+++ stty.c16 Mar 2016 23:58:14 -
@@ -30,16 +30,18 @@
  * SUCH DAMAGE.
  */

+#include 
 #include 

 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
-#include 
 #include 
+#include 
 #include 

 #include "stty.h"
Index: stty.h
===
RCS file: /cvs/src/bin/stty/stty.h,v
retrieving revision 1.4
diff -u -p -u -r1.4 stty.h
--- stty.h2 Jun 2003 23:32:09 -1.4
+++ stty.h16 Mar 2016 23:52:41 -
@@ -32,9 +32,6 @@
  *@(#)stty.h8.1 (Berkeley) 5/31/93
  */

-#include 
-#include 
-
 struct info {
 int fd;/* file descriptor */
 int ldisc;/* line discipline */

Re: stty header cleanup

[Michael McConville]

One correction:

Edgar Pettijohn wrote:
> Index: cchar.c
> ===
> RCS file: /cvs/src/bin/stty/cchar.c,v
> retrieving revision 1.11
> diff -u -p -u -r1.11 cchar.c
> --- cchar.c27 Oct 2009 23:59:22 -1.11
> +++ cchar.c16 Mar 2016 23:53:58 -
> @@ -30,6 +30,7 @@
>   * SUCH DAMAGE.
>   */
> 
> +#include 
>  #include 
> 
>  #include 

deraadt pointed out that sys/types.h has to come first here.

> Index: key.c
> ===
> RCS file: /cvs/src/bin/stty/key.c,v
> retrieving revision 1.16
> diff -u -p -u -r1.16 key.c
> --- key.c20 Nov 2015 15:57:39 -1.16
> +++ key.c16 Mar 2016 23:55:51 -
> @@ -30,14 +30,16 @@
>   * SUCH DAMAGE.
>   */
> 
> +#include 
>  #include 

And here.

> Index: stty.c
> ===
> RCS file: /cvs/src/bin/stty/stty.c,v
> retrieving revision 1.18
> diff -u -p -u -r1.18 stty.c
> --- stty.c20 Nov 2015 15:58:28 -1.18
> +++ stty.c16 Mar 2016 23:58:14 -
> @@ -30,16 +30,18 @@
>   * SUCH DAMAGE.
>   */
> 
> +#include 
>  #include 

And here.

Re: stty header cleanup

[Michael McConville]

ok mmcc@

Edgar Pettijohn wrote:
> Index: cchar.c
> ===
> RCS file: /cvs/src/bin/stty/cchar.c,v
> retrieving revision 1.11
> diff -u -p -u -r1.11 cchar.c
> --- cchar.c27 Oct 2009 23:59:22 -1.11
> +++ cchar.c16 Mar 2016 23:53:58 -
> @@ -30,6 +30,7 @@
>   * SUCH DAMAGE.
>   */
> 
> +#include 
>  #include 
> 
>  #include 
> @@ -37,6 +38,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
> 
>  #include "stty.h"
>  #include "extern.h"
> Index: gfmt.c
> ===
> RCS file: /cvs/src/bin/stty/gfmt.c,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 gfmt.c
> --- gfmt.c28 Oct 2009 07:12:59 -1.8
> +++ gfmt.c16 Mar 2016 23:54:29 -
> @@ -35,6 +35,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
> 
>  #include "stty.h"
>  #include "extern.h"
> Index: key.c
> ===
> RCS file: /cvs/src/bin/stty/key.c,v
> retrieving revision 1.16
> diff -u -p -u -r1.16 key.c
> --- key.c20 Nov 2015 15:57:39 -1.16
> +++ key.c16 Mar 2016 23:55:51 -
> @@ -30,14 +30,16 @@
>   * SUCH DAMAGE.
>   */
> 
> +#include 
>  #include 
> 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
> +#include 
>  #include 
> +#include 
> 
>  #include "stty.h"
>  #include "extern.h"
> Index: modes.c
> ===
> RCS file: /cvs/src/bin/stty/modes.c,v
> retrieving revision 1.10
> diff -u -p -u -r1.10 modes.c
> --- modes.c27 Oct 2009 23:59:22 -1.10
> +++ modes.c16 Mar 2016 23:56:40 -
> @@ -31,8 +31,11 @@
>   */
> 
>  #include 
> +
>  #include 
>  #include 
> +#include 
> +
>  #include "stty.h"
>  #include "extern.h"
> 
> Index: print.c
> ===
> RCS file: /cvs/src/bin/stty/print.c,v
> retrieving revision 1.13
> diff -u -p -u -r1.13 print.c
> --- print.c27 Oct 2009 23:59:22 -1.13
> +++ print.c16 Mar 2016 23:57:24 -
> @@ -35,6 +35,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
> 
>  #include "stty.h"
>  #include "extern.h"
> Index: stty.c
> ===
> RCS file: /cvs/src/bin/stty/stty.c,v
> retrieving revision 1.18
> diff -u -p -u -r1.18 stty.c
> --- stty.c20 Nov 2015 15:58:28 -1.18
> +++ stty.c16 Mar 2016 23:58:14 -
> @@ -30,16 +30,18 @@
>   * SUCH DAMAGE.
>   */
> 
> +#include 
>  #include 
> 
>  #include 
>  #include 
>  #include 
>  #include 
> +#include 
>  #include 
>  #include 
> -#include 
>  #include 
> +#include 
>  #include 
> 
>  #include "stty.h"
> Index: stty.h
> ===
> RCS file: /cvs/src/bin/stty/stty.h,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 stty.h
> --- stty.h2 Jun 2003 23:32:09 -1.4
> +++ stty.h16 Mar 2016 23:52:41 -
> @@ -32,9 +32,6 @@
>   *@(#)stty.h8.1 (Berkeley) 5/31/93
>   */
> 
> -#include 
> -#include 
> -
>  struct info {
>  int fd;/* file descriptor */
>  int ldisc;/* line discipline */
>