impronving io

2 files changed, 16 insertions, 48 deletions

diff --git a/kernel/syscalls.c b/kernel/syscalls.c
index c025b06..f5169e7 100644
--- a/kernel/syscalls.c
+++ b/kernel/syscalls.c
@@ -52,61 +52,27 @@ int syscall_write(int file, char *buf, int len)
 
 int syscall_read(int file, char *buf, int len)
 {
-    static bool eof=false;
-
     #ifdef LOG_SYSCALLS
     log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"read(file=%d, buf=0x%08X, len=%d)", file,buf,len);
     #endif
 
     // stdin TODO: other descroptiors!
     if(file!=0) panic(FOOLOS_MODULE_NAME,"unhandled syscall: read (only stdin)");
-    {
-	if(eof)
-	{
-	    eof=false;
-	    return 0;
-	}
     
-	char c;
-	int l=0;
-
-	while(1)
-	{
-	    while(!fifo_has(&get_fool()->std_in));
-	    c=fifo_get(&get_fool()->std_in);
-	    bool ret=true;
-	    
-	    if(ret)
-	    {
-		if(c==0x08)
-		{
-		    if(l>0)
-		    {
-			//console_del_char();
-			buf--;
-			l--;
-		    }
-		}
-		else{
-
-		    *buf=c;
-		    buf++;
-		    l++;
-		    //if(c!=0x04)console_put_char_white(c);
-		    if(c=='\n')return l;
-		    if(c==0x04)
-		    {
-			l--;
-			buf--;
-			eof=true;
-			return l;
-		    }
-		}
-		
-	    }
-
-	}
+    char c;
+    int l=0;
+
+    while(1)
+    {
+	while(!fifo_has(&get_fool()->std_in));
+	c=fifo_get(&get_fool()->std_in);
+	*buf=c;
+	buf++;
+	l++;
+	if(l==len)return l;
+	if(c=='\n')return l;
     }
+    
 
 }
 
diff --git a/userspace/snake.c b/userspace/snake.c
index afc6bf8..aedf191 100644
--- a/userspace/snake.c
+++ b/userspace/snake.c
@@ -3,9 +3,11 @@
 int main()
 {
     printf("Hello I am FoolSnake 0.1\n");
+    printf("setvbuf returned %i",setvbuf(stdin,NULL,_IONBF,0));
 
     while(1)
     {
-	printf("%c",getc(stdin));
+	printf("%c",fgetc(stdin));
+
     }
 }