fix test program: don't close before writing

set fd to writeable on open for write

diff --git a/console.c b/console.c
index 7e357fbcaa36f84bda66817264d2c75a011a0ff5..206a3800a467427bac350358f45195c32c5600d8 100644 (file)
--- a/console.c
+++ b/console.c
@@ -163,8 +163,6 @@ console_write (int minor, void *buf, int n)
   int i;
   uchar *b = buf;
 
-  cprintf ("print character to console\n");
-
   for (i = 0; i < n; i++) {
     cons_putc((int) b[i]);
   }

diff --git a/syscall.c b/syscall.c
index f0f2cc24f5ae2cc130c141377eac3fa0a07c3a68..ba3b25fe848b5a0759dc2e078229d40c029e475c 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -263,6 +263,7 @@ sys_open(void)
     iput(ip);
     return -1;
   }
+
   if((ufd = fd_ualloc()) < 0){
     iput(ip);
     fd_close(fd);
@@ -467,14 +468,6 @@ sys_block(void)
     brelse(b);
   }
 
-#if 0
-  cprintf("overwrite fs.img!\n");
-  b = getblk();
-  memset (b->data, 'f', 10);
-  bwrite(1, b, 0);
-  cprintf("write is done\n");
-#endif
-
   ip = iget(1, 1);
   cprintf("iget 1: %d %d %d %d %d %d %d %d\n",
           ip->dev, ip->inum, ip->count, ip->busy,

diff --git a/userfs.c b/userfs.c
index dcdffbbeb8de8a7a87a27e0cee59e6d046cb87b5..e6dd1726cd7662985553b257e08d0cf82f7a1737 100644 (file)
--- a/userfs.c
+++ b/userfs.c
@@ -23,7 +23,6 @@ main(void)
   fd = open("console", 1);
   if(fd >= 0){
     puts("open console ok\n");
-    close(fd);
   } else {
     puts("open console failed!\n");
   }