greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

oops - broke circular buffer

Browse source
This commit is contained in:
rsc 2007-08-30 18:20:53 +00:00
parent 71d5bf4d08
commit 37321196a4
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
console.c
View file

@ -219,7 +219,7 @@ console_intr(int (*getc)(void))
break; break;
default: default:
if(c != 0 && input.e < input.r+INPUT_BUF){ if(c != 0 && input.e < input.r+INPUT_BUF){
input.buf[input.e++] = c; input.buf[input.e++ % INPUT_BUF] = c;
cons_putc(c); cons_putc(c);
if(c == '\n' || c == C('D') || input.e == input.r+INPUT_BUF){ if(c == '\n' || c == C('D') || input.e == input.r+INPUT_BUF){
input.w = input.e; input.w = input.e;
@ -250,7 +250,7 @@ console_read(struct inode *ip, char *dst, int n)
} }
sleep(&input.r, &input.lock); sleep(&input.r, &input.lock);
} }
c = input.buf[input.r++]; c = input.buf[input.r++ % INPUT_BUF];
if(c == C('D')){ // EOF if(c == C('D')){ // EOF
if(n < target){ if(n < target){
// Save ^D for next time, to make sure // Save ^D for next time, to make sure
@ -263,8 +263,6 @@ console_read(struct inode *ip, char *dst, int n)
--n; --n;
if(c == '\n') if(c == '\n')
break; break;
if(input.r >= INPUT_BUF)
input.r = 0;
} }
release(&input.lock); release(&input.lock);
ilock(ip); ilock(ip);