dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported from ../bash-4.0.tar.gz.

Browse source
This commit is contained in:
Jari Aalto 2009-02-19 22:21:29 +00:00
commit 17345e5ad2
134 changed files with 74214 additions and 4584 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lib/sh/zread.c
View file

@ -60,7 +60,7 @@ zread (fd, buf, len)
#define NUM_INTR 3
ssize_t
zreadintr (fd, buf, len)
zreadretry (fd, buf, len)
int fd;
char *buf;
size_t len;
@ -75,7 +75,7 @@ zreadintr (fd, buf, len)
return r;
if (r == -1 && errno == EINTR)
{
if (++nintr > NUM_INTR)
if (++nintr >= NUM_INTR)
return -1;
continue;
}
@ -83,6 +83,16 @@ zreadintr (fd, buf, len)
}
}
/* Call read(2) and allow it to be interrupted. Just a stub for now. */
ssize_t
zreadintr (fd, buf, len)
int fd;
char *buf;
size_t len;
{
return (read (fd, buf, len));
}
/* Read one character from FD and return it in CP. Return values are as
in read(2). This does some local buffering to avoid many one-character
calls to read(2), like those the `read' builtin performs. */
@ -113,6 +123,31 @@ zreadc (fd, cp)
return 1;
}
/* Don't mix calls to zreadc and zreadcintr in the same function, since they
use the same local buffer. */
ssize_t
zreadcintr (fd, cp)
int fd;
char *cp;
{
ssize_t nr;
if (lind == lused || lused == 0)
{
nr = zreadintr (fd, lbuf, sizeof (lbuf));
lind = 0;
if (nr <= 0)
{
lused = 0;
return nr;
}
lused = nr;
}
if (cp)
*cp = lbuf[lind++];
return 1;
}
void
zreset ()
{