From 9fd20d4fafe1b981cba34f6ca9d79b5f415ff078 Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Sun, 23 Feb 2014 17:15:17 +0100 Subject: [PATCH] Add some support for absolute file paths --- kernel/include/disks.hpp | 1 + kernel/src/disks.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/kernel/include/disks.hpp b/kernel/include/disks.hpp index eb4a7c8d..6e914927 100644 --- a/kernel/include/disks.hpp +++ b/kernel/include/disks.hpp @@ -80,6 +80,7 @@ bool mkdir(const std::string& directory); bool touch(const std::string& file); bool rm(const std::string& file); std::string read_file(const std::string& file); +std::string read_file(const std::string& file, const std::vector& path); const disk_descriptor* mounted_disk(); const partition_descriptor* mounted_partition(); diff --git a/kernel/src/disks.cpp b/kernel/src/disks.cpp index 70c69c12..57b118cc 100644 --- a/kernel/src/disks.cpp +++ b/kernel/src/disks.cpp @@ -250,6 +250,14 @@ std::string disks::read_file(const std::string& file){ return fat32::read_file(*_mounted_disk, *_mounted_partition, pwd, file); } +std::string disks::read_file(const std::string& file, const std::vector& path){ + if(!_mounted_disk || !_mounted_partition){ + return ""; + } + + return fat32::read_file(*_mounted_disk, *_mounted_partition, path, file); +} + bool disks::mkdir(const std::string& directory){ if(!_mounted_disk || !_mounted_partition){ return false;