"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libedit/chared.c" between
tnftp-20151004.tar.gz and tnftp-20200705.tar.gz

About: tnftp is an enhanced ftp client (prior name "lukemftp").

chared.c  (tnftp-20151004):chared.c  (tnftp-20200705)
/* $NetBSD: chared.c,v 1.6 2005/06/09 16:48:57 lukem Exp $ */ /* $NetBSD: chared.c,v 1.9 2020/07/04 13:43:21 lukem Exp $ */
/* from NetBSD: chared.c,v 1.22 2004/08/13 12:10:38 mycroft Exp */ /* from NetBSD: chared.c,v 1.59 2019/07/23 10:18:52 christos Exp *
/
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* This code is derived from software contributed to Berkeley by * This code is derived from software contributed to Berkeley by
* Christos Zoulas of Cornell University. * Christos Zoulas of Cornell University.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
skipping to change at line 36 skipping to change at line 36
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include "tnftp.h" #include "config.h"
#include "sys.h"
#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID(" NetBSD: chared.c,v 1.59 2019/07/23 10:18:52 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
#endif /* tnftp */
/* /*
* chared.c: Character editor utilities * chared.c: Character editor utilities
*/ */
#if 0 /* tnftp */
#include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#endif /* tnftp */
#include "el.h" #include "el.h"
#include "common.h"
#include "fcns.h"
/* value to leave unused in line buffer */ /* value to leave unused in line buffer */
#define EL_LEAVE 2 #define EL_LEAVE 2
/* cv_undo(): /* cv_undo():
* Handle state for the vi undo command * Handle state for the vi undo command
*/ */
protected void libedit_private void
cv_undo(EditLine *el) cv_undo(EditLine *el)
{ {
c_undo_t *vu = &el->el_chared.c_undo; c_undo_t *vu = &el->el_chared.c_undo;
c_redo_t *r = &el->el_chared.c_redo; c_redo_t *r = &el->el_chared.c_redo;
unsigned int size; size_t size;
/* Save entire line for undo */ /* Save entire line for undo */
size = el->el_line.lastchar - el->el_line.buffer; size = (size_t)(el->el_line.lastchar - el->el_line.buffer);
vu->len = size; vu->len = (ssize_t)size;
vu->cursor = el->el_line.cursor - el->el_line.buffer; vu->cursor = (int)(el->el_line.cursor - el->el_line.buffer);
memcpy(vu->buf, el->el_line.buffer, size); (void)memcpy(vu->buf, el->el_line.buffer, size * sizeof(*vu->buf));
/* save command info for redo */ /* save command info for redo */
r->count = el->el_state.doingarg ? el->el_state.argument : 0; r->count = el->el_state.doingarg ? el->el_state.argument : 0;
r->action = el->el_chared.c_vcmd.action; r->action = el->el_chared.c_vcmd.action;
r->pos = r->buf; r->pos = r->buf;
r->cmd = el->el_state.thiscmd; r->cmd = el->el_state.thiscmd;
r->ch = el->el_state.thisch; r->ch = el->el_state.thisch;
} }
/* cv_yank(): /* cv_yank():
* Save yank/delete data for paste * Save yank/delete data for paste
*/ */
protected void libedit_private void
cv_yank(EditLine *el, const char *ptr, int size) cv_yank(EditLine *el, const wchar_t *ptr, int size)
{ {
c_kill_t *k = &el->el_chared.c_kill; c_kill_t *k = &el->el_chared.c_kill;
memcpy(k->buf, ptr, size +0u); (void)memcpy(k->buf, ptr, (size_t)size * sizeof(*k->buf));
k->last = k->buf + size; k->last = k->buf + size;
} }
/* c_insert(): /* c_insert():
* Insert num characters * Insert num characters
*/ */
protected void libedit_private void
c_insert(EditLine *el, int num) c_insert(EditLine *el, int num)
{ {
char *cp; wchar_t *cp;
if (el->el_line.lastchar + num >= el->el_line.limit) { if (el->el_line.lastchar + num >= el->el_line.limit) {
if (!ch_enlargebufs(el, num +0u)) if (!ch_enlargebufs(el, (size_t)num))
return; /* can't go past end of buffer */ return; /* can't go past end of buffer */
} }
if (el->el_line.cursor < el->el_line.lastchar) { if (el->el_line.cursor < el->el_line.lastchar) {
/* if I must move chars */ /* if I must move chars */
for (cp = el->el_line.lastchar; cp >= el->el_line.cursor; cp--) for (cp = el->el_line.lastchar; cp >= el->el_line.cursor; cp--)
cp[num] = *cp; cp[num] = *cp;
} }
el->el_line.lastchar += num; el->el_line.lastchar += num;
} }
/* c_delafter(): /* c_delafter():
* Delete num characters after the cursor * Delete num characters after the cursor
*/ */
protected void libedit_private void
c_delafter(EditLine *el, int num) c_delafter(EditLine *el, int num)
{ {
if (el->el_line.cursor + num > el->el_line.lastchar) if (el->el_line.cursor + num > el->el_line.lastchar)
num = el->el_line.lastchar - el->el_line.cursor; num = (int)(el->el_line.lastchar - el->el_line.cursor);
if (el->el_map.current != el->el_map.emacs) { if (el->el_map.current != el->el_map.emacs) {
cv_undo(el); cv_undo(el);
cv_yank(el, el->el_line.cursor, num); cv_yank(el, el->el_line.cursor, num);
} }
if (num > 0) { if (num > 0) {
char *cp; wchar_t *cp;
for (cp = el->el_line.cursor; cp <= el->el_line.lastchar; cp++) for (cp = el->el_line.cursor; cp <= el->el_line.lastchar; cp++)
*cp = cp[num]; *cp = cp[num];
el->el_line.lastchar -= num; el->el_line.lastchar -= num;
} }
} }
/* c_delafter1(): /* c_delafter1():
* Delete the character after the cursor, do not yank * Delete the character after the cursor, do not yank
*/ */
protected void libedit_private void
c_delafter1(EditLine *el) c_delafter1(EditLine *el)
{ {
char *cp; wchar_t *cp;
for (cp = el->el_line.cursor; cp <= el->el_line.lastchar; cp++) for (cp = el->el_line.cursor; cp <= el->el_line.lastchar; cp++)
*cp = cp[1]; *cp = cp[1];
el->el_line.lastchar--; el->el_line.lastchar--;
} }
/* c_delbefore(): /* c_delbefore():
* Delete num characters before the cursor * Delete num characters before the cursor
*/ */
protected void libedit_private void
c_delbefore(EditLine *el, int num) c_delbefore(EditLine *el, int num)
{ {
if (el->el_line.cursor - num < el->el_line.buffer) if (el->el_line.cursor - num < el->el_line.buffer)
num = el->el_line.cursor - el->el_line.buffer; num = (int)(el->el_line.cursor - el->el_line.buffer);
if (el->el_map.current != el->el_map.emacs) { if (el->el_map.current != el->el_map.emacs) {
cv_undo(el); cv_undo(el);
cv_yank(el, el->el_line.cursor - num, num); cv_yank(el, el->el_line.cursor - num, num);
} }
if (num > 0) { if (num > 0) {
char *cp; wchar_t *cp;
for (cp = el->el_line.cursor - num; for (cp = el->el_line.cursor - num;
cp <= el->el_line.lastchar; &cp[num] <= el->el_line.lastchar;
cp++) cp++)
*cp = cp[num]; *cp = cp[num];
el->el_line.lastchar -= num; el->el_line.lastchar -= num;
} }
} }
/* c_delbefore1(): /* c_delbefore1():
* Delete the character before the cursor, do not yank * Delete the character before the cursor, do not yank
*/ */
protected void libedit_private void
c_delbefore1(EditLine *el) c_delbefore1(EditLine *el)
{ {
char *cp; wchar_t *cp;
for (cp = el->el_line.cursor - 1; cp <= el->el_line.lastchar; cp++) for (cp = el->el_line.cursor - 1; cp <= el->el_line.lastchar; cp++)
*cp = cp[1]; *cp = cp[1];
el->el_line.lastchar--; el->el_line.lastchar--;
} }
/* ce__isword(): /* ce__isword():
* Return if p is part of a word according to emacs * Return if p is part of a word according to emacs
*/ */
protected int libedit_private int
ce__isword(int p) ce__isword(wint_t p)
{ {
return (isalnum(p) || strchr("*?_-.[]~=", p) != NULL); return iswalnum(p) || wcschr(L"*?_-.[]~=", p) != NULL;
} }
/* cv__isword(): /* cv__isword():
* Return if p is part of a word according to vi * Return if p is part of a word according to vi
*/ */
protected int libedit_private int
cv__isword(int p) cv__isword(wint_t p)
{ {
if (isalnum(p) || p == '_') if (iswalnum(p) || p == L'_')
return 1; return 1;
if (isgraph(p)) if (iswgraph(p))
return 2; return 2;
return 0; return 0;
} }
/* cv__isWord(): /* cv__isWord():
* Return if p is part of a big word according to vi * Return if p is part of a big word according to vi
*/ */
protected int libedit_private int
cv__isWord(int p) cv__isWord(wint_t p)
{ {
return (!isspace(p)); return !iswspace(p);
} }
/* c__prev_word(): /* c__prev_word():
* Find the previous word * Find the previous word
*/ */
protected char * libedit_private wchar_t *
c__prev_word(char *p, char *low, int n, int (*wtest)(int)) c__prev_word(wchar_t *p, wchar_t *low, int n, int (*wtest)(wint_t))
{ {
p--; p--;
while (n--) { while (n--) {
while ((p >= low) && !(*wtest)((unsigned char) *p)) while ((p >= low) && !(*wtest)(*p))
p--; p--;
while ((p >= low) && (*wtest)((unsigned char) *p)) while ((p >= low) && (*wtest)(*p))
p--; p--;
} }
/* cp now points to one character before the word */ /* cp now points to one character before the word */
p++; p++;
if (p < low) if (p < low)
p = low; p = low;
/* cp now points where we want it */ /* cp now points where we want it */
return (p); return p;
} }
/* c__next_word(): /* c__next_word():
* Find the next word * Find the next word
*/ */
protected char * libedit_private wchar_t *
c__next_word(char *p, char *high, int n, int (*wtest)(int)) c__next_word(wchar_t *p, wchar_t *high, int n, int (*wtest)(wint_t))
{ {
while (n--) { while (n--) {
while ((p < high) && !(*wtest)((unsigned char) *p)) while ((p < high) && !(*wtest)(*p))
p++; p++;
while ((p < high) && (*wtest)((unsigned char) *p)) while ((p < high) && (*wtest)(*p))
p++; p++;
} }
if (p > high) if (p > high)
p = high; p = high;
/* p now points where we want it */ /* p now points where we want it */
return (p); return p;
} }
/* cv_next_word(): /* cv_next_word():
* Find the next word vi style * Find the next word vi style
*/ */
protected char * libedit_private wchar_t *
cv_next_word(EditLine *el, char *p, char *high, int n, int (*wtest)(int)) cv_next_word(EditLine *el, wchar_t *p, wchar_t *high, int n,
int (*wtest)(wint_t))
{ {
int test; int test;
while (n--) { while (n--) {
test = (*wtest)((unsigned char) *p); test = (*wtest)(*p);
while ((p < high) && (*wtest)((unsigned char) *p) == test) while ((p < high) && (*wtest)(*p) == test)
p++; p++;
/* /*
* vi historically deletes with cw only the word preserving the * vi historically deletes with cw only the word preserving the
* trailing whitespace! This is not what 'w' does.. * trailing whitespace! This is not what 'w' does..
*/ */
if (n || el->el_chared.c_vcmd.action != (DELETE|INSERT)) if (n || el->el_chared.c_vcmd.action != (DELETE|INSERT))
while ((p < high) && isspace((unsigned char) *p)) while ((p < high) && iswspace(*p))
p++; p++;
} }
/* p now points where we want it */ /* p now points where we want it */
if (p > high) if (p > high)
return (high); return high;
else else
return (p); return p;
} }
/* cv_prev_word(): /* cv_prev_word():
* Find the previous word vi style * Find the previous word vi style
*/ */
protected char * libedit_private wchar_t *
cv_prev_word(char *p, char *low, int n, int (*wtest)(int)) cv_prev_word(wchar_t *p, wchar_t *low, int n, int (*wtest)(wint_t))
{ {
int test; int test;
p--; p--;
while (n--) { while (n--) {
while ((p > low) && isspace((unsigned char) *p)) while ((p > low) && iswspace(*p))
p--; p--;
test = (*wtest)((unsigned char) *p); test = (*wtest)(*p);
while ((p >= low) && (*wtest)((unsigned char) *p) == test) while ((p >= low) && (*wtest)(*p) == test)
p--; p--;
} }
p++; p++;
/* p now points where we want it */ /* p now points where we want it */
if (p < low) if (p < low)
return (low); return low;
else else
return (p); return p;
} }
#ifdef notdef
/* c__number():
* Ignore character p points to, return number appearing after that.
* A '$' by itself means a big number; "$-" is for negative; '^' means 1.
* Return p pointing to last char used.
*/
protected char *
c__number(
char *p, /* character position */
int *num, /* Return value */
int dval) /* dval is the number to subtract from like $-3 */
{
int i;
int sign = 1;
if (*++p == '^') {
*num = 1;
return (p);
}
if (*p == '$') {
if (*++p != '-') {
*num = 0x7fffffff; /* Handle $ */
return (--p);
}
sign = -1; /* Handle $- */
++p;
}
for (i = 0; isdigit((unsigned char) *p); i = 10 * i + *p++ - '0')
continue;
*num = (sign < 0 ? dval - i : i);
return (--p);
}
#endif
/* cv_delfini(): /* cv_delfini():
* Finish vi delete action * Finish vi delete action
*/ */
protected void libedit_private void
cv_delfini(EditLine *el) cv_delfini(EditLine *el)
{ {
int size; int size;
int action = el->el_chared.c_vcmd.action; int action = el->el_chared.c_vcmd.action;
if (action & INSERT) if (action & INSERT)
el->el_map.current = el->el_map.key; el->el_map.current = el->el_map.key;
if (el->el_chared.c_vcmd.pos == 0) if (el->el_chared.c_vcmd.pos == 0)
/* sanity */ /* sanity */
return; return;
size = el->el_line.cursor - el->el_chared.c_vcmd.pos; size = (int)(el->el_line.cursor - el->el_chared.c_vcmd.pos);
if (size == 0) if (size == 0)
size = 1; size = 1;
el->el_line.cursor = el->el_chared.c_vcmd.pos; el->el_line.cursor = el->el_chared.c_vcmd.pos;
if (action & YANK) { if (action & YANK) {
if (size > 0) if (size > 0)
cv_yank(el, el->el_line.cursor, size); cv_yank(el, el->el_line.cursor, size);
else else
cv_yank(el, el->el_line.cursor + size, -size); cv_yank(el, el->el_line.cursor + size, -size);
} else { } else {
if (size > 0) { if (size > 0) {
c_delafter(el, size); c_delafter(el, size);
re_refresh_cursor(el); re_refresh_cursor(el);
} else { } else {
c_delbefore(el, -size); c_delbefore(el, -size);
el->el_line.cursor += size; el->el_line.cursor += size;
} }
} }
el->el_chared.c_vcmd.action = NOP; el->el_chared.c_vcmd.action = NOP;
} }
#ifdef notdef
/* ce__endword():
* Go to the end of this word according to emacs
*/
protected char *
ce__endword(char *p, char *high, int n)
{
p++;
while (n--) {
while ((p < high) && isspace((unsigned char) *p))
p++;
while ((p < high) && !isspace((unsigned char) *p))
p++;
}
p--;
return (p);
}
#endif
/* cv__endword(): /* cv__endword():
* Go to the end of this word according to vi * Go to the end of this word according to vi
*/ */
protected char * libedit_private wchar_t *
cv__endword(char *p, char *high, int n, int (*wtest)(int)) cv__endword(wchar_t *p, wchar_t *high, int n, int (*wtest)(wint_t))
{ {
int test; int test;
p++; p++;
while (n--) { while (n--) {
while ((p < high) && isspace((unsigned char) *p)) while ((p < high) && iswspace(*p))
p++; p++;
test = (*wtest)((unsigned char) *p); test = (*wtest)(*p);
while ((p < high) && (*wtest)((unsigned char) *p) == test) while ((p < high) && (*wtest)(*p) == test)
p++; p++;
} }
p--; p--;
return (p); return p;
} }
/* ch_init(): /* ch_init():
* Initialize the character editor * Initialize the character editor
*/ */
protected int libedit_private int
ch_init(EditLine *el) ch_init(EditLine *el)
{ {
el->el_line.buffer = (char *) el_malloc(EL_BUFSIZ); el->el_line.buffer = el_calloc(EL_BUFSIZ,
sizeof(*el->el_line.buffer));
if (el->el_line.buffer == NULL) if (el->el_line.buffer == NULL)
return (-1); return -1;
(void) memset(el->el_line.buffer, 0, EL_BUFSIZ);
el->el_line.cursor = el->el_line.buffer; el->el_line.cursor = el->el_line.buffer;
el->el_line.lastchar = el->el_line.buffer; el->el_line.lastchar = el->el_line.buffer;
el->el_line.limit = &el->el_line.buffer[EL_BUFSIZ - EL_LEAV E]; el->el_line.limit = &el->el_line.buffer[EL_BUFSIZ - EL_LEAV E];
el->el_chared.c_undo.buf = (char *) el_malloc(EL_BUFSIZ); el->el_chared.c_undo.buf = el_calloc(EL_BUFSIZ,
sizeof(*el->el_chared.c_undo.buf));
if (el->el_chared.c_undo.buf == NULL) if (el->el_chared.c_undo.buf == NULL)
return (-1); return -1;
(void) memset(el->el_chared.c_undo.buf, 0, EL_BUFSIZ);
el->el_chared.c_undo.len = -1; el->el_chared.c_undo.len = -1;
el->el_chared.c_undo.cursor = 0; el->el_chared.c_undo.cursor = 0;
el->el_chared.c_redo.buf = (char *) el_malloc(EL_BUFSIZ); el->el_chared.c_redo.buf = el_calloc(EL_BUFSIZ,
sizeof(*el->el_chared.c_redo.buf));
if (el->el_chared.c_redo.buf == NULL) if (el->el_chared.c_redo.buf == NULL)
return (-1); return -1;
el->el_chared.c_redo.pos = el->el_chared.c_redo.buf; el->el_chared.c_redo.pos = el->el_chared.c_redo.buf;
el->el_chared.c_redo.lim = el->el_chared.c_redo.buf + EL_BUFSIZ; el->el_chared.c_redo.lim = el->el_chared.c_redo.buf + EL_BUFSIZ;
el->el_chared.c_redo.cmd = ED_UNASSIGNED; el->el_chared.c_redo.cmd = ED_UNASSIGNED;
el->el_chared.c_vcmd.action = NOP; el->el_chared.c_vcmd.action = NOP;
el->el_chared.c_vcmd.pos = el->el_line.buffer; el->el_chared.c_vcmd.pos = el->el_line.buffer;
el->el_chared.c_kill.buf = (char *) el_malloc(EL_BUFSIZ); el->el_chared.c_kill.buf = el_calloc(EL_BUFSIZ,
sizeof(*el->el_chared.c_kill.buf));
if (el->el_chared.c_kill.buf == NULL) if (el->el_chared.c_kill.buf == NULL)
return (-1); return -1;
(void) memset(el->el_chared.c_kill.buf, 0, EL_BUFSIZ);
el->el_chared.c_kill.mark = el->el_line.buffer; el->el_chared.c_kill.mark = el->el_line.buffer;
el->el_chared.c_kill.last = el->el_chared.c_kill.buf; el->el_chared.c_kill.last = el->el_chared.c_kill.buf;
el->el_chared.c_resizefun = NULL;
el->el_chared.c_resizearg = NULL;
el->el_chared.c_aliasfun = NULL;
el->el_chared.c_aliasarg = NULL;
el->el_map.current = el->el_map.key; el->el_map.current = el->el_map.key;
el->el_state.inputmode = MODE_INSERT; /* XXX: save a default */ el->el_state.inputmode = MODE_INSERT; /* XXX: save a default */
el->el_state.doingarg = 0; el->el_state.doingarg = 0;
el->el_state.metanext = 0; el->el_state.metanext = 0;
el->el_state.argument = 1; el->el_state.argument = 1;
el->el_state.lastcmd = ED_UNASSIGNED; el->el_state.lastcmd = ED_UNASSIGNED;
el->el_chared.c_macro.level = -1; return 0;
el->el_chared.c_macro.offset = 0;
el->el_chared.c_macro.macro = (char **) el_malloc(EL_MAXMACRO *
sizeof(char *));
if (el->el_chared.c_macro.macro == NULL)
return (-1);
return (0);
} }
/* ch_reset(): /* ch_reset():
* Reset the character editor * Reset the character editor
*/ */
protected void libedit_private void
ch_reset(EditLine *el) ch_reset(EditLine *el)
{ {
el->el_line.cursor = el->el_line.buffer; el->el_line.cursor = el->el_line.buffer;
el->el_line.lastchar = el->el_line.buffer; el->el_line.lastchar = el->el_line.buffer;
el->el_chared.c_undo.len = -1; el->el_chared.c_undo.len = -1;
el->el_chared.c_undo.cursor = 0; el->el_chared.c_undo.cursor = 0;
el->el_chared.c_vcmd.action = NOP; el->el_chared.c_vcmd.action = NOP;
el->el_chared.c_vcmd.pos = el->el_line.buffer; el->el_chared.c_vcmd.pos = el->el_line.buffer;
skipping to change at line 504 skipping to change at line 465
el->el_chared.c_kill.mark = el->el_line.buffer; el->el_chared.c_kill.mark = el->el_line.buffer;
el->el_map.current = el->el_map.key; el->el_map.current = el->el_map.key;
el->el_state.inputmode = MODE_INSERT; /* XXX: save a default */ el->el_state.inputmode = MODE_INSERT; /* XXX: save a default */
el->el_state.doingarg = 0; el->el_state.doingarg = 0;
el->el_state.metanext = 0; el->el_state.metanext = 0;
el->el_state.argument = 1; el->el_state.argument = 1;
el->el_state.lastcmd = ED_UNASSIGNED; el->el_state.lastcmd = ED_UNASSIGNED;
el->el_chared.c_macro.level = -1;
el->el_history.eventno = 0; el->el_history.eventno = 0;
} }
/* ch_enlargebufs(): /* ch_enlargebufs():
* Enlarge line buffer to be able to hold twice as much characters. * Enlarge line buffer to be able to hold twice as much characters.
* Returns 1 if successful, 0 if not. * Returns 1 if successful, 0 if not.
*/ */
protected int libedit_private int
ch_enlargebufs(el, addlen) ch_enlargebufs(EditLine *el, size_t addlen)
EditLine *el;
size_t addlen;
{ {
size_t sz, newsz; size_t sz, newsz;
char *newbuffer, *oldbuf, *oldkbuf; wchar_t *newbuffer, *oldbuf, *oldkbuf;
sz = el->el_line.limit - el->el_line.buffer + EL_LEAVE; sz = (size_t)(el->el_line.limit - el->el_line.buffer + EL_LEAVE);
newsz = sz * 2; newsz = sz * 2;
/* /*
* If newly required length is longer than current buffer, we need * If newly required length is longer than current buffer, we need
* to make the buffer big enough to hold both old and new stuff. * to make the buffer big enough to hold both old and new stuff.
*/ */
if (addlen > sz) { if (addlen > sz) {
while(newsz - sz < addlen) while(newsz - sz < addlen)
newsz *= 2; newsz *= 2;
} }
/* /*
* Reallocate line buffer. * Reallocate line buffer.
*/ */
newbuffer = el_realloc(el->el_line.buffer, newsz); newbuffer = el_realloc(el->el_line.buffer, newsz * sizeof(*newbuffer));
if (!newbuffer) if (!newbuffer)
return 0; return 0;
/* zero the newly added memory, leave old data in */ /* zero the newly added memory, leave old data in */
(void) memset(&newbuffer[sz], 0, newsz - sz); (void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
oldbuf = el->el_line.buffer; oldbuf = el->el_line.buffer;
el->el_line.buffer = newbuffer; el->el_line.buffer = newbuffer;
el->el_line.cursor = newbuffer + (el->el_line.cursor - oldbuf); el->el_line.cursor = newbuffer + (el->el_line.cursor - oldbuf);
el->el_line.lastchar = newbuffer + (el->el_line.lastchar - oldbuf); el->el_line.lastchar = newbuffer + (el->el_line.lastchar - oldbuf);
/* don't set new size until all buffers are enlarged */ /* don't set new size until all buffers are enlarged */
el->el_line.limit = &newbuffer[sz - EL_LEAVE]; el->el_line.limit = &newbuffer[sz - EL_LEAVE];
/* /*
* Reallocate kill buffer. * Reallocate kill buffer.
*/ */
newbuffer = el_realloc(el->el_chared.c_kill.buf, newsz); newbuffer = el_realloc(el->el_chared.c_kill.buf, newsz *
sizeof(*newbuffer));
if (!newbuffer) if (!newbuffer)
return 0; return 0;
/* zero the newly added memory, leave old data in */ /* zero the newly added memory, leave old data in */
(void) memset(&newbuffer[sz], 0, newsz - sz); (void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
oldkbuf = el->el_chared.c_kill.buf; oldkbuf = el->el_chared.c_kill.buf;
el->el_chared.c_kill.buf = newbuffer; el->el_chared.c_kill.buf = newbuffer;
el->el_chared.c_kill.last = newbuffer + el->el_chared.c_kill.last = newbuffer +
(el->el_chared.c_kill.last - oldkbuf); (el->el_chared.c_kill.last - oldkbuf);
el->el_chared.c_kill.mark = el->el_line.buffer + el->el_chared.c_kill.mark = el->el_line.buffer +
(el->el_chared.c_kill.mark - oldbuf); (el->el_chared.c_kill.mark - oldbuf);
/* /*
* Reallocate undo buffer. * Reallocate undo buffer.
*/ */
newbuffer = el_realloc(el->el_chared.c_undo.buf, newsz); newbuffer = el_realloc(el->el_chared.c_undo.buf,
newsz * sizeof(*newbuffer));
if (!newbuffer) if (!newbuffer)
return 0; return 0;
/* zero the newly added memory, leave old data in */ /* zero the newly added memory, leave old data in */
(void) memset(&newbuffer[sz], 0, newsz - sz); (void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
el->el_chared.c_undo.buf = newbuffer; el->el_chared.c_undo.buf = newbuffer;
newbuffer = el_realloc(el->el_chared.c_redo.buf, newsz); newbuffer = el_realloc(el->el_chared.c_redo.buf,
newsz * sizeof(*newbuffer));
if (!newbuffer) if (!newbuffer)
return 0; return 0;
el->el_chared.c_redo.pos = newbuffer + el->el_chared.c_redo.pos = newbuffer +
(el->el_chared.c_redo.pos - el->el_chared.c_redo.buf); (el->el_chared.c_redo.pos - el->el_chared.c_redo.buf);
el->el_chared.c_redo.lim = newbuffer + el->el_chared.c_redo.lim = newbuffer +
(el->el_chared.c_redo.lim - el->el_chared.c_redo.buf); (el->el_chared.c_redo.lim - el->el_chared.c_redo.buf);
el->el_chared.c_redo.buf = newbuffer; el->el_chared.c_redo.buf = newbuffer;
if (!hist_enlargebuf(el, sz, newsz)) if (!hist_enlargebuf(el, sz, newsz))
return 0; return 0;
/* Safe to set enlarged buffer size */ /* Safe to set enlarged buffer size */
el->el_line.limit = &el->el_line.buffer[newsz - EL_LEAVE]; el->el_line.limit = &el->el_line.buffer[newsz - EL_LEAVE];
if (el->el_chared.c_resizefun)
(*el->el_chared.c_resizefun)(el, el->el_chared.c_resizearg);
return 1; return 1;
} }
/* ch_end(): /* ch_end():
* Free the data structures used by the editor * Free the data structures used by the editor
*/ */
protected void libedit_private void
ch_end(EditLine *el) ch_end(EditLine *el)
{ {
el_free((ptr_t) el->el_line.buffer); el_free(el->el_line.buffer);
el->el_line.buffer = NULL; el->el_line.buffer = NULL;
el->el_line.limit = NULL; el->el_line.limit = NULL;
el_free((ptr_t) el->el_chared.c_undo.buf); el_free(el->el_chared.c_undo.buf);
el->el_chared.c_undo.buf = NULL; el->el_chared.c_undo.buf = NULL;
el_free((ptr_t) el->el_chared.c_redo.buf); el_free(el->el_chared.c_redo.buf);
el->el_chared.c_redo.buf = NULL; el->el_chared.c_redo.buf = NULL;
el->el_chared.c_redo.pos = NULL; el->el_chared.c_redo.pos = NULL;
el->el_chared.c_redo.lim = NULL; el->el_chared.c_redo.lim = NULL;
el->el_chared.c_redo.cmd = ED_UNASSIGNED; el->el_chared.c_redo.cmd = ED_UNASSIGNED;
el_free((ptr_t) el->el_chared.c_kill.buf); el_free(el->el_chared.c_kill.buf);
el->el_chared.c_kill.buf = NULL; el->el_chared.c_kill.buf = NULL;
el_free((ptr_t) el->el_chared.c_macro.macro);
el->el_chared.c_macro.macro = NULL;
ch_reset(el); ch_reset(el);
} }
/* el_insertstr(): /* el_insertstr():
* Insert string at cursorI * Insert string at cursor
*/ */
public int int
el_insertstr(EditLine *el, const char *s) el_winsertstr(EditLine *el, const wchar_t *s)
{ {
size_t len; size_t len;
if ((len = strlen(s)) == 0) if (s == NULL || (len = wcslen(s)) == 0)
return (-1); return -1;
if (el->el_line.lastchar + len >= el->el_line.limit) { if (el->el_line.lastchar + len >= el->el_line.limit) {
if (!ch_enlargebufs(el, len)) if (!ch_enlargebufs(el, len))
return (-1); return -1;
} }
c_insert(el, (int)len); c_insert(el, (int)len);
while (*s) while (*s)
*el->el_line.cursor++ = *s++; *el->el_line.cursor++ = *s++;
return (0); return 0;
} }
/* el_deletestr(): /* el_deletestr():
* Delete num characters before the cursor * Delete num characters before the cursor
*/ */
public void void
el_deletestr(EditLine *el, int n) el_deletestr(EditLine *el, int n)
{ {
if (n <= 0) if (n <= 0)
return; return;
if (el->el_line.cursor < &el->el_line.buffer[n]) if (el->el_line.cursor < &el->el_line.buffer[n])
return; return;
c_delbefore(el, n); /* delete before dot */ c_delbefore(el, n); /* delete before dot */
el->el_line.cursor -= n; el->el_line.cursor -= n;
if (el->el_line.cursor < el->el_line.buffer) if (el->el_line.cursor < el->el_line.buffer)
el->el_line.cursor = el->el_line.buffer; el->el_line.cursor = el->el_line.buffer;
} }
/* el_cursor():
* Move the cursor to the left or the right of the current position
*/
int
el_cursor(EditLine *el, int n)
{
if (n == 0)
goto out;
el->el_line.cursor += n;
if (el->el_line.cursor < el->el_line.buffer)
el->el_line.cursor = el->el_line.buffer;
if (el->el_line.cursor > el->el_line.lastchar)
el->el_line.cursor = el->el_line.lastchar;
out:
return (int)(el->el_line.cursor - el->el_line.buffer);
}
/* c_gets(): /* c_gets():
* Get a string * Get a string
*/ */
protected int libedit_private int
c_gets(EditLine *el, char *buf, const char *prompt) c_gets(EditLine *el, wchar_t *buf, const wchar_t *prompt)
{ {
char ch; ssize_t len;
int len; wchar_t *cp = el->el_line.buffer, ch;
char *cp = el->el_line.buffer;
if (prompt) { if (prompt) {
len = strlen(prompt); len = (ssize_t)wcslen(prompt);
memcpy(cp, prompt, len + 0u); (void)memcpy(cp, prompt, (size_t)len * sizeof(*cp));
cp += len; cp += len;
} }
len = 0; len = 0;
for (;;) { for (;;) {
el->el_line.cursor = cp; el->el_line.cursor = cp;
*cp = ' '; *cp = ' ';
el->el_line.lastchar = cp + 1; el->el_line.lastchar = cp + 1;
re_refresh(el); re_refresh(el);
if (el_getc(el, &ch) != 1) { if (el_wgetc(el, &ch) != 1) {
ed_end_of_file(el, 0); ed_end_of_file(el, 0);
len = -1; len = -1;
break; break;
} }
switch (ch) { switch (ch) {
case 0010: /* Delete and backspace */ case L'\b': /* Delete and backspace */
case 0177: case 0177:
if (len <= 0) { if (len == 0) {
len = -1; len = -1;
break; break;
} }
len--;
cp--; cp--;
continue; continue;
case 0033: /* ESC */ case 0033: /* ESC */
case '\r': /* Newline */ case L'\r': /* Newline */
case '\n': case L'\n':
buf[len] = ch; buf[len] = ch;
break; break;
default: default:
if (len >= EL_BUFSIZ - 16) if (len >= (ssize_t)(EL_BUFSIZ - 16))
term_beep(el); terminal_beep(el);
else { else {
buf[len++] = ch; buf[len++] = ch;
*cp++ = ch; *cp++ = ch;
} }
continue; continue;
} }
break; break;
} }
el->el_line.buffer[0] = '\0'; el->el_line.buffer[0] = '\0';
el->el_line.lastchar = el->el_line.buffer; el->el_line.lastchar = el->el_line.buffer;
el->el_line.cursor = el->el_line.buffer; el->el_line.cursor = el->el_line.buffer;
return len; return (int)len;
} }
/* c_hpos(): /* c_hpos():
* Return the current horizontal position of the cursor * Return the current horizontal position of the cursor
*/ */
protected int libedit_private int
c_hpos(EditLine *el) c_hpos(EditLine *el)
{ {
char *ptr; wchar_t *ptr;
/* /*
* Find how many characters till the beginning of this line. * Find how many characters till the beginning of this line.
*/ */
if (el->el_line.cursor == el->el_line.buffer) if (el->el_line.cursor == el->el_line.buffer)
return (0); return 0;
else { else {
for (ptr = el->el_line.cursor - 1; for (ptr = el->el_line.cursor - 1;
ptr >= el->el_line.buffer && *ptr != '\n'; ptr >= el->el_line.buffer && *ptr != '\n';
ptr--) ptr--)
continue; continue;
return (el->el_line.cursor - ptr - 1); return (int)(el->el_line.cursor - ptr - 1);
} }
} }
libedit_private int
ch_resizefun(EditLine *el, el_zfunc_t f, void *a)
{
el->el_chared.c_resizefun = f;
el->el_chared.c_resizearg = a;
return 0;
}
libedit_private int
ch_aliasfun(EditLine *el, el_afunc_t f, void *a)
{
el->el_chared.c_aliasfun = f;
el->el_chared.c_aliasarg = a;
return 0;
}
 End of changes. 110 change blocks. 
193 lines changed or deleted 173 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)