Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

knf ch_enlargebufs(), to be *consistent* with the rest of this file...

Browse Source
This commit is contained in:
lukem 2001-04-13 01:04:19 +00:00
parent 4241f48b35
commit 5e45b51a6b
1 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
lib/libedit/chared.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: chared.c,v 1.12 2001/01/10 07:45:41 jdolecek Exp $ */ /* $NetBSD: chared.c,v 1.13 2001/04/13 01:04:19 lukem Exp $ */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -41,7 +41,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93"; static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
#else #else
__RCSID("$NetBSD: chared.c,v 1.12 2001/01/10 07:45:41 jdolecek Exp $"); __RCSID("$NetBSD: chared.c,v 1.13 2001/04/13 01:04:19 lukem Exp $");
#endif #endif
#endif /* not lint && not SCCSID */ #endif /* not lint && not SCCSID */
@ -491,75 +491,76 @@ ch_reset(EditLine *el)
*/ */
protected int protected int
ch_enlargebufs(el, addlen) ch_enlargebufs(el, addlen)
EditLine *el; EditLine *el;
size_t addlen; size_t addlen;
{ {
size_t sz = el->el_line.limit - el->el_line.buffer + EL_LEAVE; size_t sz, newsz;
size_t newsz = sz * 2; char *newbuffer, *oldbuf, *oldkbuf;
char *newbuffer, *oldbuf, *oldkbuf;
/* sz = el->el_line.limit - el->el_line.buffer + EL_LEAVE;
* If newly required length is longer than current buffer, we need newsz = sz * 2;
* to make the buffer big enough to hold both old and new stuff. /*
*/ * If newly required length is longer than current buffer, we need
if (addlen > sz) { * to make the buffer big enough to hold both old and new stuff.
while(newsz - sz < addlen) */
newsz *= 2; if (addlen > sz) {
} while(newsz - sz < addlen)
newsz *= 2;
}
/* /*
* Reallocate line buffer. * Reallocate line buffer.
*/ */
newbuffer = el_realloc(el->el_line.buffer, newsz); newbuffer = el_realloc(el->el_line.buffer, newsz);
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);
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);
el->el_line.limit = &newbuffer[newsz - EL_LEAVE]; el->el_line.limit = &newbuffer[newsz - 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);
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);
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);
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);
el->el_chared.c_undo.ptr = el->el_line.buffer + el->el_chared.c_undo.ptr = el->el_line.buffer +
(el->el_chared.c_undo.ptr - oldbuf); (el->el_chared.c_undo.ptr - oldbuf);
el->el_chared.c_undo.buf = newbuffer; el->el_chared.c_undo.buf = newbuffer;
if (!hist_enlargebuf(el, sz, newsz)) if (!hist_enlargebuf(el, sz, newsz))
return 0; return 0;
return 1; return 1;
} }
/* ch_end(): /* ch_end():