From 6f4ae5140d3e6c3e7fb6d0689a8313ad352e9a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 15 Jun 2004 16:00:53 +0000 Subject: [PATCH] Renamed VFS syscalls to the new scheme. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7979 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/apps/rld/rld0.c | 6 ++--- src/kernel/apps/rld/rldaux.c | 2 +- src/kernel/apps/rld/rldelf.c | 8 +++--- src/kernel/apps/shell/commands.c | 2 +- src/kernel/apps/shell/parse.c | 42 ++++++++++++++++-------------- src/kernel/apps/shell/shell_defs.h | 1 + 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/kernel/apps/rld/rld0.c b/src/kernel/apps/rld/rld0.c index 2adde93fe3..5da01d5eab 100644 --- a/src/kernel/apps/rld/rld0.c +++ b/src/kernel/apps/rld/rld0.c @@ -9,9 +9,9 @@ int RLD_STARTUP(void *args) { #if DEBUG_RLD - sys_close(0); open("/dev/console", 0); /* stdin */ - sys_close(1); open("/dev/console", 0); /* stdout */ - sys_close(2); open("/dev/console", 0); /* stderr */ + close(0); open("/dev/console", 0); /* stdin */ + close(1); open("/dev/console", 0); /* stdout */ + close(2); open("/dev/console", 0); /* stderr */ #endif return rldmain(args); } diff --git a/src/kernel/apps/rld/rldaux.c b/src/kernel/apps/rld/rldaux.c index acd0015027..84b628a299 100644 --- a/src/kernel/apps/rld/rldaux.c +++ b/src/kernel/apps/rld/rldaux.c @@ -20,7 +20,7 @@ printf(const char *fmt, ...) i = vsprintf(buf, fmt, args); va_end(args); - sys_write(2, 0, buf, strlen(buf)); + _kern_write(2, 0, buf, strlen(buf)); return i; } diff --git a/src/kernel/apps/rld/rldelf.c b/src/kernel/apps/rld/rldelf.c index 8e7ef5d1e7..63c5b85f1f 100644 --- a/src/kernel/apps/rld/rldelf.c +++ b/src/kernel/apps/rld/rldelf.c @@ -811,10 +811,10 @@ load_container(char const *path, char const *name, image_type type) return found; } - fd = sys_open(path, 0); + fd = _kern_open(path, 0); FATAL((fd < 0), "cannot open file %s\n", path); - len = sys_read(fd, 0, &eheader, sizeof(eheader)); + len = _kern_read(fd, 0, &eheader, sizeof(eheader)); FATAL((len != sizeof(eheader)), "troubles reading ELF header\n"); if (parse_elf_header(&eheader, &pheaderSize, &sheaderSize) < B_OK) { @@ -823,7 +823,7 @@ load_container(char const *path, char const *name, image_type type) // ToDo: what to do about this restriction?? FATAL((pheaderSize > (int)sizeof(ph_buff)), "cannot handle Program headers bigger than %lu\n", (long unsigned)sizeof(ph_buff)); - len = sys_read(fd, eheader.e_phoff, ph_buff, pheaderSize); + len = _kern_read(fd, eheader.e_phoff, ph_buff, pheaderSize); FATAL((len != pheaderSize), "troubles reading Program headers\n"); num_regions = count_regions(ph_buff, eheader.e_phnum, eheader.e_phentsize); @@ -845,7 +845,7 @@ load_container(char const *path, char const *name, image_type type) image->type = type; register_image(image, path); - sys_close(fd); + _kern_close(fd); enqueue_image(&gLoadedImages, image); diff --git a/src/kernel/apps/shell/commands.c b/src/kernel/apps/shell/commands.c index f41641cbf1..8cf5c3fd8d 100644 --- a/src/kernel/apps/shell/commands.c +++ b/src/kernel/apps/shell/commands.c @@ -97,7 +97,7 @@ cmd_mkdir(int argc, char *argv[]) return 0; } - rc = sys_create_dir(argv[1],0755); + rc = _kern_create_dir(argv[1],0755); if (rc < 0) { printf("sys_mkdir() returned error: %s\n", strerror(rc)); } else { diff --git a/src/kernel/apps/shell/parse.c b/src/kernel/apps/shell/parse.c index 8f0547624b..3be9977862 100644 --- a/src/kernel/apps/shell/parse.c +++ b/src/kernel/apps/shell/parse.c @@ -1,8 +1,9 @@ #include #include -#include +#include #include #include +#include #include "parse.h" #include "commands.h" @@ -485,7 +486,8 @@ void parse_vars_in_string(const char *string,char *out,int max_len) } -static int launch(int (*cmd)(int, char **), int argc, char **argv, char *r_in, char *r_out) +static int +launch(int (*cmd)(int, char **), int argc, char **argv, char *r_in, char *r_out) { int saved_in; int saved_out; @@ -495,11 +497,11 @@ static int launch(int (*cmd)(int, char **), int argc, char **argv, char *r_in, c int err; if (strcmp(r_in, "")!= 0) { - new_in = sys_open(r_in, 0); + new_in = open(r_in, 0); if (new_in < 0) - new_in = sys_create(r_in, 0, 0644); + new_in = creat(r_in, 0644); } else { - new_in = sys_dup(0); + new_in = dup(0); } if (new_in < 0) { err = new_in; @@ -507,36 +509,36 @@ static int launch(int (*cmd)(int, char **), int argc, char **argv, char *r_in, c } if (strcmp(r_out, "")!= 0) { - new_out = sys_open(r_out, 0); + new_out = open(r_out, 0); if (new_out < 0) - new_out = sys_create(r_out, 0, 0644); + new_out = creat(r_out, 0644); } else { - new_out = sys_dup(1); + new_out = dup(1); } if (new_out < 0) { err = new_out; goto err_2; } - saved_in = sys_dup(0); - saved_out= sys_dup(1); + saved_in = dup(0); + saved_out= dup(1); - sys_dup2(new_in, 0); - sys_dup2(new_out, 1); - sys_close(new_in); - sys_close(new_out); + dup2(new_in, 0); + dup2(new_out, 1); + close(new_in); + close(new_out); - retval= cmd(argc, argv); + retval = cmd(argc, argv); - sys_dup2(saved_in, 0); - sys_dup2(saved_out, 1); - sys_close(saved_in); - sys_close(saved_out); + dup2(saved_in, 0); + dup2(saved_out, 1); + close(saved_in); + close(saved_out); return 0; err_2: - sys_close(new_in); + close(new_in); err_1: return err; } diff --git a/src/kernel/apps/shell/shell_defs.h b/src/kernel/apps/shell/shell_defs.h index 19371d3db5..f40947c450 100644 --- a/src/kernel/apps/shell/shell_defs.h +++ b/src/kernel/apps/shell/shell_defs.h @@ -1,6 +1,7 @@ #ifndef _shell_defs_h_ #define _shell_defs_h_ +#include #include "script.h" #define NAME_VAR_PATH "path"