emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from vodz:

Browse Source 
Changed email address
    cmdedit API change
    optimizations for traceroute and md5sum
    added a new shared create_icmp_socket() function
This commit is contained in:
Eric Andersen
2001-07-12 20:26:32 +00:00
parent f69bfc76fa
commit 7467c8d3b6
27 changed files with 641 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shell/msh.c
View File

@@ -682,8 +682,7 @@ static void * brkaddr;
#ifdef BB_FEATURE_COMMAND_EDITING
char * current_prompt;
unsigned int shell_context;
static char * current_prompt;
#endif
@@ -4449,9 +4448,7 @@ register struct ioarg *ap;
if ((i = ap->afid != bp->id) || bp->bufp == bp->ebufp) {
if (i)
lseek(ap->afile, ap->afpos, 0);
do {
i = read(ap->afile, bp->buf, sizeof(bp->buf));
} while (i < 0 && errno == EINTR);
i = safe_read(ap->afile, bp->buf, sizeof(bp->buf));
if (i <= 0) {
closef(ap->afile);
return 0;
@@ -4470,7 +4467,6 @@ register struct ioarg *ap;
while (size == 0 || position >= size) {
cmdedit_read_input(current_prompt, mycommand);
cmdedit_terminate();
size = strlen(mycommand);
position = 0;
}
@@ -4480,9 +4476,7 @@ register struct ioarg *ap;
} else
#endif
{
do {
i = read(ap->afile, &c, sizeof(c));
} while (i < 0 && errno == EINTR);
i = safe_read(ap->afile, &c, sizeof(c));
return(i == sizeof(c)? c&0177: (closef(ap->afile), 0));
}
}