Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file: Fix several bugs to do with handling of path field

Browse Source
This commit is contained in:
mintsuki 2023-01-20 17:27:41 +01:00
parent 2091aa9c21
commit 28dd8a1062
5 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/fs/file.h
View File

@ -19,6 +19,7 @@ struct file_handle {
bool readall;
struct volume *vol;
char *path;
size_t path_len;
void *fd;
void (*read)(void *fd, void *buf, uint64_t loc, uint64_t count);
void (*close)(void *fd);

4
common/fs/file.s2.c
View File

@ -53,7 +53,7 @@ struct file_handle *fopen(struct volume *part, const char *filename) {
if ((ret = tftp_open(part, "", filename)) == NULL) {
return NULL;
}
goto success;
return ret;
}
if ((ret = ext2_open(part, filename)) != NULL) {
@ -70,6 +70,7 @@ struct file_handle *fopen(struct volume *part, const char *filename) {
success:
ret->path = (char *)filename;
ret->path_len = filename_new_len;
return ret;
}
@ -82,6 +83,7 @@ void fclose(struct file_handle *fd) {
} else {
fd->close(fd);
}
pmm_free(fd->path, fd->path_len);
pmm_free(fd, sizeof(struct file_handle));
}

3
common/lib/uri.c
View File

@ -279,6 +279,9 @@ struct file_handle *uri_open(char *uri) {
panic(true, "tinf error");
}
compressed_fd->vol = ret->vol;
compressed_fd->path = ext_mem_alloc(ret->path_len);
memcpy(compressed_fd->path, ret->path, ret->path_len);
compressed_fd->path_len = ret->path_len;
fclose(ret);
compressed_fd->is_memfile = true;
ret = compressed_fd;

5
common/protos/limine.c
View File

@ -227,7 +227,10 @@ static struct limine_file get_file(struct file_handle *file, char *cmdline) {
}
}
ret.path = reported_addr(file->path);
char *path = ext_mem_alloc(file->path_len);
memcpy(path, file->path, file->path_len);
ret.path = reported_addr(path);
ret.address = reported_addr(freadall(file, MEMMAP_KERNEL_AND_MODULES));
ret.size = file->size;

12
common/pxe/tftp.s2.c
View File

@ -69,6 +69,12 @@ struct file_handle *tftp_open(struct volume *part, const char *server_addr, cons
handle->pxe_ip = server_ip;
handle->pxe_port = server_port;
size_t name_len = strlen(name);
handle->path = ext_mem_alloc(1 + name_len + 1);
handle->path[0] = '/';
memcpy(&handle->path[1], name, name_len);
handle->path_len = 1 + name_len + 1;
struct pxenv_open open = {
.status = 0,
.sip = server_ip,
@ -179,6 +185,12 @@ struct file_handle *tftp_open(struct volume *part, const char *server_addr, cons
handle->pxe_ip = *(uint32_t *)&ip;
handle->pxe_port = 69;
size_t name_len = strlen(name);
handle->path = ext_mem_alloc(1 + name_len + 1);
handle->path[0] = '/';
memcpy(&handle->path[1], name, name_len);
handle->path_len = 1 + name_len + 1;
handle->fd = ext_mem_alloc(handle->size);
status = part->pxe_base_code->Mtftp(