benji/portland-os
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removing stub for special handling of 'sd' prefix in file paths from knob

Browse source 
passing a path with an 'sd' prefix will now act like any other path on the first drive, instead of closing the calling program.
eventually, i will add a system of mounting drives directly into a file hierarchy (like in unix), and have all of the system calls just pass a path, no drive number
This commit is contained in:
Benji Dial 2021-03-02 20:43:19 -05:00
parent e9a11deef0
commit 053c6f0d9f
2 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/user/knob/file.c
View file

@ -28,19 +28,8 @@ struct file {
uint32_t length;
};
const char *remove_prefix(const char *path, uint8_t *dn_out) {
if ((path[0] == 's') && (path[1] == 'd'))
PANIC("remove_prefix not fully implemented");
*dn_out = 0;//change this later to an "active drive" or something
return path;
}
struct file *open_file(const char *path) {
uint8_t dn;
path = remove_prefix(path, &dn);
_file_handle_t h = _open_file(dn, path);
_file_handle_t h = _open_file(0, path);
if (!h)
return 0;
@ -131,16 +120,13 @@ void trunc_file(struct file *f) {
//return value must be manually freed, unless it is a null pointer
_dir_info_entry_t *get_directory_info(const char *path, uint32_t *count_out) {
uint8_t dn;
path = remove_prefix(path, &dn);
uint32_t count = _count_of_dir(dn, path);
uint32_t count = _count_of_dir(0, path);
if (!count) {
*count_out = 0;
return 0;
}
_dir_info_entry_t *buffer = get_block(count * sizeof(_dir_info_entry_t));
*count_out = _enumerate_dir(dn, path, buffer, count);
*count_out = _enumerate_dir(0, path, buffer, count);
return buffer;
}

7
src/user/knob/task.c
View file

@ -8,21 +8,18 @@
#include <knob/format.h>
_task_handle_t run_command(const char *path, _task_handle_t stdio_task) {
uint8_t dn;
path = remove_prefix(path, &dn);
for (const char *ptr = path; *ptr; ++ptr)
if (*ptr == ' ') {
char *new_path = get_block(ptr - path + 1);
blockcpy(new_path, path, ptr - path);
new_path[ptr - path] = '\0';
_task_handle_t handle = _start_task(dn, new_path, ptr + 1, stdio_task);
_task_handle_t handle = _start_task(0, new_path, ptr + 1, stdio_task);
free_block(new_path);
return handle;
}
return _start_task(dn, path, "", stdio_task);
return _start_task(0, path, "", stdio_task);
}
bool try_run_command_blocking(const char *path, _task_handle_t stdio_task) {