diff options
| -rw-r--r-- | bin/ksh/edit.c | 4 | ||||
| -rw-r--r-- | bin/ksh/emacs.c | 6 | ||||
| -rw-r--r-- | bin/ksh/main.c | 6 | ||||
| -rw-r--r-- | bin/ksh/var.c | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/bin/ksh/edit.c b/bin/ksh/edit.c index 06963375fb2..f4621ac0a48 100644 --- a/bin/ksh/edit.c +++ b/bin/ksh/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/bin/ksh/emacs.c b/bin/ksh/emacs.c index 392b0246fe1..3ec71f04bf5 100644 --- a/bin/ksh/emacs.c +++ b/bin/ksh/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/bin/ksh/main.c b/bin/ksh/main.c index 2db79dc4cbb..070c38dadfa 100644 --- a/bin/ksh/main.c +++ b/bin/ksh/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/bin/ksh/var.c b/bin/ksh/var.c index b6ee7ebf009..400e4f629b3 100644 --- a/bin/ksh/var.c +++ b/bin/ksh/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; |