sh: Change input buffer size from 1023 to 1024.
PR: bin/161756
This commit is contained in:
parent
52c450395a
commit
7f40c1f876
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=230118
@ -97,7 +97,7 @@ int parsenleft; /* copy of parsefile->nleft */
|
||||
MKINIT int parselleft; /* copy of parsefile->lleft */
|
||||
char *parsenextc; /* copy of parsefile->nextc */
|
||||
MKINIT struct parsefile basepf; /* top level input file */
|
||||
char basebuf[BUFSIZ]; /* buffer for top level input file */
|
||||
char basebuf[BUFSIZ + 1]; /* buffer for top level input file */
|
||||
static struct parsefile *parsefile = &basepf; /* current input file */
|
||||
int init_editline = 0; /* editline library initialized? */
|
||||
int whichprompt; /* 1 == PS1, 2 == PS2 */
|
||||
@ -189,8 +189,8 @@ preadfd(void)
|
||||
nr = 0;
|
||||
else {
|
||||
nr = el_len;
|
||||
if (nr > BUFSIZ - 1)
|
||||
nr = BUFSIZ - 1;
|
||||
if (nr > BUFSIZ)
|
||||
nr = BUFSIZ;
|
||||
memcpy(parsenextc, rl_cp, nr);
|
||||
if (nr != el_len) {
|
||||
el_len -= nr;
|
||||
@ -200,7 +200,7 @@ preadfd(void)
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
nr = read(parsefile->fd, parsenextc, BUFSIZ - 1);
|
||||
nr = read(parsefile->fd, parsenextc, BUFSIZ);
|
||||
|
||||
if (nr <= 0) {
|
||||
if (nr < 0) {
|
||||
@ -428,13 +428,13 @@ setinputfd(int fd, int push)
|
||||
(void)fcntl(fd, F_SETFD, FD_CLOEXEC);
|
||||
if (push) {
|
||||
pushfile();
|
||||
parsefile->buf = ckmalloc(BUFSIZ);
|
||||
parsefile->buf = ckmalloc(BUFSIZ + 1);
|
||||
}
|
||||
if (parsefile->fd > 0)
|
||||
close(parsefile->fd);
|
||||
parsefile->fd = fd;
|
||||
if (parsefile->buf == NULL)
|
||||
parsefile->buf = ckmalloc(BUFSIZ);
|
||||
parsefile->buf = ckmalloc(BUFSIZ + 1);
|
||||
parselleft = parsenleft = 0;
|
||||
plinno = 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user