From 56018212567b00acab49a858d7374adbff28623e Mon Sep 17 00:00:00 2001
From: mmcc <mmcc@openbsd.org>
Date: Mon, 19 Oct 2015 14:42:16 +0000
Subject: [PATCH] Move string.h include from sh.h to the files that use it.

ok nicm@
---
 bin/ksh/c_ksh.c    | 3 ++-
 bin/ksh/c_sh.c     | 4 +++-
 bin/ksh/c_test.c   | 4 +++-
 bin/ksh/c_ulimit.c | 4 +++-
 bin/ksh/edit.c     | 3 ++-
 bin/ksh/emacs.c    | 3 ++-
 bin/ksh/eval.c     | 3 ++-
 bin/ksh/exec.c     | 3 ++-
 bin/ksh/expr.c     | 3 ++-
 bin/ksh/history.c  | 4 +++-
 bin/ksh/io.c       | 3 ++-
 bin/ksh/jobs.c     | 3 ++-
 bin/ksh/lex.c      | 3 ++-
 bin/ksh/mail.c     | 3 ++-
 bin/ksh/main.c     | 3 ++-
 bin/ksh/misc.c     | 3 ++-
 bin/ksh/mknod.c    | 3 ++-
 bin/ksh/path.c     | 4 +++-
 bin/ksh/sh.h       | 3 +--
 bin/ksh/shf.c      | 3 ++-
 bin/ksh/syn.c      | 4 +++-
 bin/ksh/table.c    | 3 ++-
 bin/ksh/trap.c     | 4 +++-
 bin/ksh/tree.c     | 4 +++-
 bin/ksh/tty.c      | 4 +++-
 bin/ksh/var.c      | 3 ++-
 bin/ksh/vi.c       | 3 ++-
 27 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/bin/ksh/c_ksh.c b/bin/ksh/c_ksh.c
index ff61292f20c..a8bb906bda8 100644
--- a/bin/ksh/c_ksh.c
+++ b/bin/ksh/c_ksh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_ksh.c,v 1.44 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: c_ksh.c,v 1.45 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * built-in Korn commands: c_*
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 
 #include <ctype.h>
+#include <string.h>
 
 #include "sh.h"
 
diff --git a/bin/ksh/c_sh.c b/bin/ksh/c_sh.c
index de3b6b3bdac..dcb8e0a97e1 100644
--- a/bin/ksh/c_sh.c
+++ b/bin/ksh/c_sh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_sh.c,v 1.51 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: c_sh.c,v 1.52 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * built-in Bourne commands
@@ -8,6 +8,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
+#include <string.h>
+
 #include "sh.h"
 
 static void p_time(struct shf *, int, struct timeval *, int, char *, char *);
diff --git a/bin/ksh/c_test.c b/bin/ksh/c_test.c
index e252638c6a2..56d5d60d7e8 100644
--- a/bin/ksh/c_test.c
+++ b/bin/ksh/c_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_test.c,v 1.21 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: c_test.c,v 1.22 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * test(1); version 7-like  --  author Erik Baalbergen
@@ -11,6 +11,8 @@
 
 #include <sys/stat.h>
 
+#include <string.h>
+
 #include "sh.h"
 #include "c_test.h"
 
diff --git a/bin/ksh/c_ulimit.c b/bin/ksh/c_ulimit.c
index 0e8278d1717..8d3124e2764 100644
--- a/bin/ksh/c_ulimit.c
+++ b/bin/ksh/c_ulimit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_ulimit.c,v 1.21 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: c_ulimit.c,v 1.22 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
 	ulimit -- handle "ulimit" builtin
@@ -20,6 +20,8 @@
 
 #include <sys/resource.h>
 
+#include <string.h>
+
 #include "sh.h"
 
 #define SOFT	0x1
diff --git a/bin/ksh/edit.c b/bin/ksh/edit.c
index 54952e91f7e..ed2f9a3babc 100644
--- a/bin/ksh/edit.c
+++ b/bin/ksh/edit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: edit.c,v 1.47 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: edit.c,v 1.48 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * Command line editing - common code
@@ -13,6 +13,7 @@
 
 #include <ctype.h>
 #include <libgen.h>
+#include <string.h>
 
 #include "sh.h"
 #include "edit.h"
diff --git a/bin/ksh/emacs.c b/bin/ksh/emacs.c
index 2663051740b..0bce4e2b1d8 100644
--- a/bin/ksh/emacs.c
+++ b/bin/ksh/emacs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emacs.c,v 1.59 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: emacs.c,v 1.60 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  *  Emacs-like command line editing and history
@@ -19,6 +19,7 @@
 
 #include <ctype.h>
 #include <locale.h>
+#include <string.h>
 
 #include "sh.h"
 #include "edit.h"
diff --git a/bin/ksh/eval.c b/bin/ksh/eval.c
index d03ed7a168a..c19758c919b 100644
--- a/bin/ksh/eval.c
+++ b/bin/ksh/eval.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eval.c,v 1.44 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: eval.c,v 1.45 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * Expansion - quoting, separation, substitution, globbing
@@ -8,6 +8,7 @@
 
 #include <dirent.h>
 #include <pwd.h>
+#include <string.h>
 
 #include "sh.h"
 
diff --git a/bin/ksh/exec.c b/bin/ksh/exec.c
index bc8945eaa7e..9e56cc7e649 100644
--- a/bin/ksh/exec.c
+++ b/bin/ksh/exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.c,v 1.60 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: exec.c,v 1.61 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * execute command tree
@@ -8,6 +8,7 @@
 
 #include <ctype.h>
 #include <paths.h>
+#include <string.h>
 
 #include "sh.h"
 #include "c_test.h"
diff --git a/bin/ksh/expr.c b/bin/ksh/expr.c
index d7bf29f9ec5..fc5ec1e2fd4 100644
--- a/bin/ksh/expr.c
+++ b/bin/ksh/expr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expr.c,v 1.30 2015/10/19 14:03:21 mmcc Exp $	*/
+/*	$OpenBSD: expr.c,v 1.31 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * Korn expression evaluation
@@ -9,6 +9,7 @@
 
 #include <ctype.h>
 #include <limits.h>
+#include <string.h>
 
 #include "sh.h"
 
diff --git a/bin/ksh/history.c b/bin/ksh/history.c
index d43cda9f480..74aae960910 100644
--- a/bin/ksh/history.c
+++ b/bin/ksh/history.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: history.c,v 1.48 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: history.c,v 1.49 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * command history
@@ -15,6 +15,8 @@
 
 #include <sys/stat.h>
 
+#include <string.h>
+
 #include "sh.h"
 
 #ifdef HISTORY
diff --git a/bin/ksh/io.c b/bin/ksh/io.c
index 4d220555acd..a035ede507a 100644
--- a/bin/ksh/io.c
+++ b/bin/ksh/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.31 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: io.c,v 1.32 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * shell buffered IO and formatted output
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 
 #include <ctype.h>
+#include <string.h>
 
 #include "sh.h"
 
diff --git a/bin/ksh/jobs.c b/bin/ksh/jobs.c
index a9292300662..09d073028da 100644
--- a/bin/ksh/jobs.c
+++ b/bin/ksh/jobs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: jobs.c,v 1.49 2015/10/19 14:03:21 mmcc Exp $	*/
+/*	$OpenBSD: jobs.c,v 1.50 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * Process and job control
@@ -21,6 +21,7 @@
 #include <sys/wait.h>
 
 #include <limits.h>
+#include <string.h>
 
 #include "sh.h"
 #include "tty.h"
diff --git a/bin/ksh/lex.c b/bin/ksh/lex.c
index e08eae18322..624acf33262 100644
--- a/bin/ksh/lex.c
+++ b/bin/ksh/lex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lex.c,v 1.60 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: lex.c,v 1.61 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * lexical analysis and source input
@@ -6,6 +6,7 @@
 
 #include <ctype.h>
 #include <libgen.h>
+#include <string.h>
 
 #include "sh.h"
 
diff --git a/bin/ksh/mail.c b/bin/ksh/mail.c
index 7c592dbfbdf..3f642566f49 100644
--- a/bin/ksh/mail.c
+++ b/bin/ksh/mail.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mail.c,v 1.21 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: mail.c,v 1.22 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * Mailbox checking code by Robert J. Gibson, adapted for PD ksh by
@@ -7,6 +7,7 @@
 
 #include <sys/stat.h>
 
+#include <string.h>
 #include <time.h>
 
 #include "config.h"
diff --git a/bin/ksh/main.c b/bin/ksh/main.c
index 4fe57cababc..c495256255c 100644
--- a/bin/ksh/main.c
+++ b/bin/ksh/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.68 2015/10/19 14:01:37 mmcc Exp $	*/
+/*	$OpenBSD: main.c,v 1.69 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * startup, main loop, environments and error handling
@@ -10,6 +10,7 @@
 
 #include <paths.h>
 #include <pwd.h>
+#include <string.h>
 
 #include "sh.h"
 
diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c
index 4d9af6b6929..c7e5537c458 100644
--- a/bin/ksh/misc.c
+++ b/bin/ksh/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.48 2015/10/19 14:03:21 mmcc Exp $	*/
+/*	$OpenBSD: misc.c,v 1.49 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * Miscellaneous functions
@@ -6,6 +6,7 @@
 
 #include <ctype.h>
 #include <limits.h>
+#include <string.h>
 
 #include "sh.h"
 #include "charclass.h"
diff --git a/bin/ksh/mknod.c b/bin/ksh/mknod.c
index b802c44a068..50d338c7724 100644
--- a/bin/ksh/mknod.c
+++ b/bin/ksh/mknod.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mknod.c,v 1.3 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: mknod.c,v 1.4 2015/10/19 14:42:16 mmcc Exp $	*/
 /*	$NetBSD: mknod.c,v 1.8 1995/08/11 00:08:18 jtc Exp $	*/
 
 /*
@@ -37,6 +37,7 @@
 #include <sys/stat.h>
 
 #include <errno.h>
+#include <string.h>
 
 #include "sh.h"
 
diff --git a/bin/ksh/path.c b/bin/ksh/path.c
index e7afe0c2fbc..3c0b6bef346 100644
--- a/bin/ksh/path.c
+++ b/bin/ksh/path.c
@@ -1,7 +1,9 @@
-/*	$OpenBSD: path.c,v 1.16 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: path.c,v 1.17 2015/10/19 14:42:16 mmcc Exp $	*/
 
 #include <sys/stat.h>
 
+#include <string.h>
+
 #include "sh.h"
 
 /*
diff --git a/bin/ksh/sh.h b/bin/ksh/sh.h
index 23685674894..488b8bddd14 100644
--- a/bin/ksh/sh.h
+++ b/bin/ksh/sh.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sh.h,v 1.42 2015/10/19 14:03:21 mmcc Exp $	*/
+/*	$OpenBSD: sh.h,v 1.43 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * Public Domain Bourne/Korn shell
@@ -17,7 +17,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
 #include <stdarg.h>
 
 #include <errno.h>
diff --git a/bin/ksh/shf.c b/bin/ksh/shf.c
index 2d032eb81c7..1d7825bfb36 100644
--- a/bin/ksh/shf.c
+++ b/bin/ksh/shf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shf.c,v 1.24 2015/10/19 14:03:21 mmcc Exp $	*/
+/*	$OpenBSD: shf.c,v 1.25 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  *  Shell file I/O routines
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 
 #include <limits.h>
+#include <string.h>
 
 #include "sh.h"
 
diff --git a/bin/ksh/syn.c b/bin/ksh/syn.c
index 23ffaa2b700..7c7183b0a9f 100644
--- a/bin/ksh/syn.c
+++ b/bin/ksh/syn.c
@@ -1,9 +1,11 @@
-/*	$OpenBSD: syn.c,v 1.35 2015/10/15 22:53:50 mmcc Exp $	*/
+/*	$OpenBSD: syn.c,v 1.36 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * shell parser (C version)
  */
 
+#include <string.h>
+
 #include "sh.h"
 #include "c_test.h"
 
diff --git a/bin/ksh/table.c b/bin/ksh/table.c
index d22eca066a2..6f4d08b13ea 100644
--- a/bin/ksh/table.c
+++ b/bin/ksh/table.c
@@ -1,10 +1,11 @@
-/*	$OpenBSD: table.c,v 1.20 2015/10/19 14:03:21 mmcc Exp $	*/
+/*	$OpenBSD: table.c,v 1.21 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * dynamic hashed associative table for commands and variables
  */
 
 #include <limits.h>
+#include <string.h>
 
 #include "sh.h"
 
diff --git a/bin/ksh/trap.c b/bin/ksh/trap.c
index 0aafa2685d1..e8b6f3bb26a 100644
--- a/bin/ksh/trap.c
+++ b/bin/ksh/trap.c
@@ -1,9 +1,11 @@
-/*	$OpenBSD: trap.c,v 1.26 2015/10/09 19:36:27 tedu Exp $	*/
+/*	$OpenBSD: trap.c,v 1.27 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * signal handling
  */
 
+#include <string.h>
+
 #include "sh.h"
 
 Trap sigtraps[NSIG + 1];
diff --git a/bin/ksh/tree.c b/bin/ksh/tree.c
index bb728de106e..7ad4704e0fd 100644
--- a/bin/ksh/tree.c
+++ b/bin/ksh/tree.c
@@ -1,9 +1,11 @@
-/*	$OpenBSD: tree.c,v 1.25 2015/10/09 19:36:27 tedu Exp $	*/
+/*	$OpenBSD: tree.c,v 1.26 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  * command tree climbing
  */
 
+#include <string.h>
+
 #include "sh.h"
 
 #define INDENT	4
diff --git a/bin/ksh/tty.c b/bin/ksh/tty.c
index 0a5e0fe0d66..4804381c92e 100644
--- a/bin/ksh/tty.c
+++ b/bin/ksh/tty.c
@@ -1,4 +1,6 @@
-/*	$OpenBSD: tty.c,v 1.13 2015/10/15 20:01:53 mmcc Exp $	*/
+/*	$OpenBSD: tty.c,v 1.14 2015/10/19 14:42:16 mmcc Exp $	*/
+
+#include <string.h>
 
 #include "sh.h"
 #include "tty.h"
diff --git a/bin/ksh/var.c b/bin/ksh/var.c
index d1776717599..43ad53a1209 100644
--- a/bin/ksh/var.c
+++ b/bin/ksh/var.c
@@ -1,9 +1,10 @@
-/*	$OpenBSD: var.c,v 1.52 2015/10/19 14:03:21 mmcc Exp $	*/
+/*	$OpenBSD: var.c,v 1.53 2015/10/19 14:42:16 mmcc Exp $	*/
 
 #include <sys/stat.h>
 
 #include <ctype.h>
 #include <limits.h>
+#include <string.h>
 #include <time.h>
 
 #include "sh.h"
diff --git a/bin/ksh/vi.c b/bin/ksh/vi.c
index fa62e2d26b1..ea114929d1f 100644
--- a/bin/ksh/vi.c
+++ b/bin/ksh/vi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vi.c,v 1.35 2015/10/19 02:15:45 mmcc Exp $	*/
+/*	$OpenBSD: vi.c,v 1.36 2015/10/19 14:42:16 mmcc Exp $	*/
 
 /*
  *	vi command editing
@@ -12,6 +12,7 @@
 #include <sys/stat.h>		/* completion */
 
 #include <ctype.h>
+#include <string.h>
 
 #include "sh.h"
 #include "edit.h"
-- 
2.20.1