16,20c16
< * 3. All advertising materials mentioning features or use of this software
< * must display the following acknowledgement:
< * This product includes software developed by the University of
< * California, Berkeley and its contributors.
< * 4. Neither the name of the University nor the names of its contributors
---
> * 3. Neither the name of the University nor the names of its contributors
37,38c33,34
< * $NetBSD: histedit.h,v 1.15 2000/02/28 17:41:05 chopps Exp $
< * $FreeBSD: head/include/histedit.h 117556 2003-07-14 16:31:20Z imp $
---
> * $NetBSD: histedit.h,v 1.28 2005/07/14 15:00:58 christos Exp $
> * $FreeBSD: head/include/histedit.h 148834 2005-08-07 20:55:59Z stefanf $
54a51
>
66d62
<
86d81
< void el_reset(EditLine *);
87a83
> void el_reset(EditLine *);
89d84
<
95c90
< void el_push(EditLine *, const char *);
---
> void el_push(EditLine *, char *);
106c101
< int el_parse(EditLine *, int, char **);
---
> int el_parse(EditLine *, int, const char **);
112a108,110
> #if 0
> unsigned char _el_fn_complete(EditLine *, int);
> #endif
130a129,132
> #define EL_GETCFN 13 /* , el_rfunc_t); */
> #define EL_CLIENTDATA 14 /* , void *); */
> #define EL_UNBUFFERED 15 /* , int); */
> #define EL_PREP_TERM 16 /* , int); */
131a134,135
> #define EL_BUILTIN_GETCFN (NULL)
>
157a162
>
186c191
< #define H_SET 7 /* , void); */
---
> #define H_SET 7 /* , int); */
197a203,205
> #define H_SETUNIQUE 20 /* , int); */
> #define H_GETUNIQUE 21 /* , void); */
> #define H_DEL 22 /* , int); */
198a207,224
>
> /*
> * ==== Tokenization ====
> */
>
> typedef struct tokenizer Tokenizer;
>
> /*
> * String tokenization functions, using simplified sh(1) quoting rules
> */
> Tokenizer *tok_init(const char *);
> void tok_end(Tokenizer *);
> void tok_reset(Tokenizer *);
> int tok_line(Tokenizer *, const LineInfo *,
> int *, const char ***, int *, int *);
> int tok_str(Tokenizer *, const char *,
> int *, const char ***);
>