From a31a6e8312ed78c7666d3be278a8db92a079b397 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Sun, 29 Jun 2003 14:51:25 +0000
Subject: [PATCH] Sync OpenBSD source tree from -current CVS.

---
 edit.c  | 4 +++-
 emacs.c | 6 +++++-
 main.c  | 6 ++----
 var.c   | 4 +++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/edit.c b/edit.c
index 0696337..f4621ac 100644
--- a/edit.c
+++ b/edit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: edit.c,v 1.16 2003/05/05 22:02:33 fgsch Exp $	*/
+/*	$OpenBSD: edit.c,v 1.17 2003/06/26 00:09:45 deraadt Exp $	*/
 
 /*
  * Command line editing - common code
@@ -630,6 +630,8 @@ struct path_order_info {
 	int path_order;
 };
 
+static int path_order_cmp(const void *aa, const void *bb);
+
 /* Compare routine used in x_command_glob() */
 static int
 path_order_cmp(aa, bb)
diff --git a/emacs.c b/emacs.c
index 392b024..3ec71f0 100644
--- a/emacs.c
+++ b/emacs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emacs.c,v 1.19 2003/04/16 23:11:52 tdeval Exp $	*/
+/*	$OpenBSD: emacs.c,v 1.20 2003/06/26 00:09:45 deraadt Exp $	*/
 
 /*
  *  Emacs-like command line editing and history
@@ -438,6 +438,8 @@ x_ins_string(c)
 	return KSTD;
 }
 
+static int x_do_ins(const char *cp, int len);
+
 static int
 x_do_ins(cp, len)
 	const char *cp;
@@ -1533,6 +1535,8 @@ x_init_emacs()
 		x_usemeta = 1;
 }
 
+static void bind_if_not_bound(int p, int k, int func);
+
 static void
 bind_if_not_bound(p, k, func)
 	int p, k;
diff --git a/main.c b/main.c
index 2db79dc..070c38d 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.24 2003/04/04 23:12:02 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.25 2003/06/26 00:09:45 deraadt Exp $	*/
 
 /*
  * startup, main loop, environments and error handling
@@ -83,9 +83,7 @@ static const char *const initcoms [] = {
 };
 
 int
-main(argc, argv)
-	int argc;
-	register char **argv;
+main(int argc, char *argv[])
 {
 	register int i;
 	int argi;
diff --git a/var.c b/var.c
index b6ee7eb..400e4f6 100644
--- a/var.c
+++ b/var.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: var.c,v 1.14 2003/04/16 23:11:52 tdeval Exp $	*/
+/*	$OpenBSD: var.c,v 1.15 2003/06/26 00:09:45 deraadt Exp $	*/
 
 #include "sh.h"
 #include "ksh_time.h"
@@ -125,6 +125,8 @@ initvar()
  * non-zero if this is an array, sets *valp to the array index, returns
  * the basename of the array.
  */
+const char *array_index_calc(const char *n, bool_t *arrayp, int *valp);
+
 const char *
 array_index_calc(n, arrayp, valp)
 	const char *n;