diff options
Diffstat (limited to 'src/user')
-rw-r--r-- | src/user/app/init/driver/ansiterm.c | 12 | ||||
-rw-r--r-- | src/user/app/init/driver/tmpfs.c | 9 | ||||
-rw-r--r-- | src/user/lib/file.c | 5 |
3 files changed, 15 insertions, 11 deletions
diff --git a/src/user/app/init/driver/ansiterm.c b/src/user/app/init/driver/ansiterm.c index 5daab41..0c720eb 100644 --- a/src/user/app/init/driver/ansiterm.c +++ b/src/user/app/init/driver/ansiterm.c @@ -84,10 +84,14 @@ void ansiterm_drv(void) { break; case VFSOP_WRITE: - for (size_t i = 0; i < res.len; i++) - in_char(buf[i]); - /* if (pendingFlush) */ flush(); - _syscall_fs_respond(NULL, res.len, 0); + if (res.flags) { + _syscall_fs_respond(NULL, -1, 0); + } else { + for (size_t i = 0; i < res.len; i++) + in_char(buf[i]); + /* if (pendingFlush) */ flush(); + _syscall_fs_respond(NULL, res.len, 0); + } break; default: diff --git a/src/user/app/init/driver/tmpfs.c b/src/user/app/init/driver/tmpfs.c index e4c079c..7bda37f 100644 --- a/src/user/app/init/driver/tmpfs.c +++ b/src/user/app/init/driver/tmpfs.c @@ -99,11 +99,7 @@ void tmpfs_drv(void) { _syscall_fs_respond(NULL, -1, 0); break; } - if (res.len == 0) { - _syscall_fs_respond(NULL, 0, 0); - break; - } - if (!ptr->buf) { + if (res.len > 0 && !ptr->buf) { ptr->buf = malloc(256); if (!ptr->buf) { _syscall_fs_respond(NULL, -1, 0); @@ -121,8 +117,9 @@ void tmpfs_drv(void) { } memcpy(ptr->buf + res.offset, buf, res.len); - if (ptr->size < res.offset + res.len) + if ((res.flags & WRITE_TRUNCATE) || ptr->size < res.offset + res.len) { ptr->size = res.offset + res.len; + } _syscall_fs_respond(NULL, res.len, 0); break; diff --git a/src/user/lib/file.c b/src/user/lib/file.c index b7e70e6..bd8cb76 100644 --- a/src/user/lib/file.c +++ b/src/user/lib/file.c @@ -17,13 +17,16 @@ FILE *fopen(const char *path, const char *mode) { int flags = 0; if (mode[0] == 'w' || mode[0] == 'a') flags |= OPEN_CREATE; - // TODO truncate on w h = _syscall_open(path, strlen(path), flags); if (h < 0) { errno = -h; return NULL; } + + if (mode[0] == 'w') + _syscall_write(h, NULL, 0, 0, WRITE_TRUNCATE); + f = fdopen(h, mode); if (!f) close(h); return f; |