Sync OpenBSD source tree from -current CVS.
This commit is contained in:
parent
7e92d31546
commit
a31a6e8312
4
edit.c
4
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
|
* Command line editing - common code
|
||||||
@ -630,6 +630,8 @@ struct path_order_info {
|
|||||||
int path_order;
|
int path_order;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static int path_order_cmp(const void *aa, const void *bb);
|
||||||
|
|
||||||
/* Compare routine used in x_command_glob() */
|
/* Compare routine used in x_command_glob() */
|
||||||
static int
|
static int
|
||||||
path_order_cmp(aa, bb)
|
path_order_cmp(aa, bb)
|
||||||
|
6
emacs.c
6
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
|
* Emacs-like command line editing and history
|
||||||
@ -438,6 +438,8 @@ x_ins_string(c)
|
|||||||
return KSTD;
|
return KSTD;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int x_do_ins(const char *cp, int len);
|
||||||
|
|
||||||
static int
|
static int
|
||||||
x_do_ins(cp, len)
|
x_do_ins(cp, len)
|
||||||
const char *cp;
|
const char *cp;
|
||||||
@ -1533,6 +1535,8 @@ x_init_emacs()
|
|||||||
x_usemeta = 1;
|
x_usemeta = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void bind_if_not_bound(int p, int k, int func);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
bind_if_not_bound(p, k, func)
|
bind_if_not_bound(p, k, func)
|
||||||
int p, k;
|
int p, k;
|
||||||
|
6
main.c
6
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
|
* startup, main loop, environments and error handling
|
||||||
@ -83,9 +83,7 @@ static const char *const initcoms [] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
int
|
int
|
||||||
main(argc, argv)
|
main(int argc, char *argv[])
|
||||||
int argc;
|
|
||||||
register char **argv;
|
|
||||||
{
|
{
|
||||||
register int i;
|
register int i;
|
||||||
int argi;
|
int argi;
|
||||||
|
4
var.c
4
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 "sh.h"
|
||||||
#include "ksh_time.h"
|
#include "ksh_time.h"
|
||||||
@ -125,6 +125,8 @@ initvar()
|
|||||||
* non-zero if this is an array, sets *valp to the array index, returns
|
* non-zero if this is an array, sets *valp to the array index, returns
|
||||||
* the basename of the array.
|
* the basename of the array.
|
||||||
*/
|
*/
|
||||||
|
const char *array_index_calc(const char *n, bool_t *arrayp, int *valp);
|
||||||
|
|
||||||
const char *
|
const char *
|
||||||
array_index_calc(n, arrayp, valp)
|
array_index_calc(n, arrayp, valp)
|
||||||
const char *n;
|
const char *n;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user