d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

try to free mem as soon as possible

Browse source
This commit is contained in:
ceriel 1988-01-14 13:53:58 +00:00
parent fb65cda40f
commit e873fd637d
2 changed files with 34 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/src/input/Makefile
View file

@ -3,6 +3,7 @@ MODULES = $(EMHOME)/modules
INSTALL = $(MODULES)/install
COMPARE = $(MODULES)/compare
CFLAGS = -O
AR = ar
OBJECTS = AtEoIF.o\
AtEoIT.o
@ -10,7 +11,7 @@ OBJECTS = AtEoIF.o\
all: libinput.a
libinput.a: $(OBJECTS)
ar cr libinput.a $(OBJECTS)
$(AR) cr libinput.a $(OBJECTS)
-sh -c 'ranlib libinput.a'
install: all

39
modules/src/input/inp_pkg.body
View file

@ -111,7 +111,6 @@ readfile(fd, fn, size, pbuf)
((unsigned) (*size + 1) != (*size + 1))
||
!(*pbuf = malloc((unsigned) (*size + 1)))) {
sys_close(fd);
return 0;
}
if (
@ -119,11 +118,9 @@ readfile(fd, fn, size, pbuf)
||
*size != rsize
) {
sys_close(fd);
free(*pbuf);
return 0;
}
sys_close(fd);
(*pbuf)[*size] = '\0'; /* invoke loadbuf() at end */
return 1;
}
@ -181,17 +178,6 @@ pop_bh()
{
register struct buffer_header *bh = head;
if (bh->bh_fd) { /* unstack a file */
#ifndef INP_READ_IN_ONE
struct i_buf *ib;
ib = i_ptr->next;
free((char *) i_ptr);
i_ptr = ib;
#else INP_READ_IN_ONE
free(bh->bh_text);
#endif INP_READ_IN_ONE
}
bh = bh->next;
free((char *) head);
@ -356,6 +342,7 @@ loadbuf()
return EOI;
}
if (!bh->bh_eofreturned) {
if (_ipp < &(bh->bh_text[bh->bh_size])) {
/* a genuine '\0' character has been seen */
return '\0';
@ -364,7 +351,7 @@ loadbuf()
FromFile = (bh->bh_fd != 0);
#ifndef INP_READ_IN_ONE
if (FromFile) {
if (FromFile && bh->bh_size > 0) {
#if INP_PUSHBACK > 1
register char *so = &(bh->bh_text[bh->bh_size]);
register char *de = bh->bh_text;
@ -375,8 +362,7 @@ loadbuf()
*--de = *--so;
}
#endif
if (
readblock(bh->bh_fd, bh->bh_text, &(bh->bh_size))
if ( readblock(bh->bh_fd, bh->bh_text, &(bh->bh_size))
&&
bh->bh_size > 0
) {
@ -386,10 +372,21 @@ loadbuf()
}
#endif not INP_READ_IN_ONE
if (FromFile && bh->bh_fd != STDIN) sys_close(bh->bh_fd);
if (!bh->bh_eofreturned) {
if (bh->bh_fd) { /* unstack a file */
#ifndef INP_READ_IN_ONE
struct i_buf *ib;
ib = i_ptr->next;
free((char *) i_ptr);
i_ptr = ib;
#else INP_READ_IN_ONE
free(bh->bh_text);
#endif INP_READ_IN_ONE
}
bh->bh_eofreturned = 1;
_ipp--;
_ipp = "";
if (FromFile) {
if (AtEoIF()) return EOI;
}
@ -398,10 +395,6 @@ loadbuf()
}
}
#ifndef INP_READ_IN_ONE
if (FromFile && bh->bh_fd != STDIN) sys_close(bh->bh_fd);
#endif not INP_READ_IN_ONE
if (pop_bh()) {
if (*_ipp) return *_ipp++;
return loadbuf();