diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2003-10-31 08:48:17 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2003-10-31 08:48:17 +0000 |
| commit | 94d0072cb5856c2cb998567132dcf66cbcac9fba (patch) | |
| tree | 02059687cccd68c5564a59aa524b5dbdd0745b37 /usr.bin/pmdb/clit.c | |
| parent | 86b4ccfc14fc81f13dd7a4cb9129ccea185dc317 (diff) | |
New libedit api changes.
Tested by djm@, mouring@, jmc@.
ok deraadt@
Diffstat (limited to 'usr.bin/pmdb/clit.c')
| -rw-r--r-- | usr.bin/pmdb/clit.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/usr.bin/pmdb/clit.c b/usr.bin/pmdb/clit.c index 10cce14ed65..249710f5d12 100644 --- a/usr.bin/pmdb/clit.c +++ b/usr.bin/pmdb/clit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clit.c,v 1.4 2002/08/09 02:23:48 aaron Exp $ */ +/* $OpenBSD: clit.c,v 1.5 2003/10/31 08:47:31 otto Exp $ */ /* * Copyright (c) 2002 Artur Grabowski <art@openbsd.org> * All rights reserved. @@ -136,9 +136,7 @@ void * cmdinit(struct clit *cmds, int ncmds) { struct clitenv *env; -#ifdef __NetBSD__ HistEvent ev; -#endif if ((env = malloc(sizeof(*env))) == NULL) err(1, "Can't init cmd interpreter."); @@ -147,17 +145,10 @@ cmdinit(struct clit *cmds, int ncmds) env->ncmds = ncmds; env->hist = history_init(); -#ifdef __NetBSD__ history(env->hist, &ev, H_SETSIZE, 100); -#else - history(env->hist, H_EVENT, 100); -#endif -#ifdef __NetBSD__ env->el = el_init(__progname, stdin, stdout, stderr); -#else - env->el = el_init(__progname, stdin, stdout); -#endif + el_set(env->el, EL_EDITOR, "emacs"); el_set(env->el, EL_PROMPT, prompt); el_set(env->el, EL_HIST, history, env->hist); @@ -203,17 +194,11 @@ cmdloop(void *arg) struct clit *cmdp; char **ap; int argc, res; -#ifdef __NetBSD__ HistEvent ev; -#endif memset(argv, 0, sizeof(char *) * maxargs); -#ifdef __NetBSD__ history(hist, &ev, H_ENTER, elline); -#else - history(hist, H_ENTER, elline); -#endif orgline = line = strdup(elline); if (line == NULL) @@ -237,7 +222,7 @@ cmdloop(void *arg) /* * Editline commands. */ - if (el_parse(el, argc, argv) != -1) + if (el_parse(el, argc, (const char **)argv) != -1) goto cmdout; if ((res = name_to_cmd(argv[0], env->cmds, env->ncmds, |