Kernel can now load an Initrd.

10 files changed, 91 insertions, 11 deletions

diff --git a/Init.rfs b/Init.rfs
new file mode 100644
index 0000000..912a1f9
--- /dev/null
+++ b/Init.rfs
diff --git a/Makefile b/Makefile
index 391efa5..664900f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: clean, mrproper, Init.img
+.PHONY: clean, mrproper, Init.rfs
 
 Files = Source/Kernel/Melon.ke Init.rfs
 Floppy = Melon.img
@@ -6,7 +6,7 @@ Floppy = Melon.img
 Projects = Kernel Tools/MakeRamFS
 
 RamFS = Init.rfs
-RamFSFiles = :/System :/System/Applications :/System/Configuration
+RamFSFiles = :/System :/System/Applications Source/Kernel/Ressources/Welcome.txt:/Welcome.txt :/System/Configuration
 
 all:
 	for p in $(Projects); do \
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp
index 19888c9..6806411 100644
--- a/Source/Kernel/Core/kmain.wtf.cpp
+++ b/Source/Kernel/Core/kmain.wtf.cpp
@@ -110,14 +110,14 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	PROCESSING(kvt, "Detecting floppy drives...");
 	FloppyController::detect(); OK(kvt);
 
-	asm volatile("sti");
-
-	FileSystem* fs = new RamFS(1024 * 1024);
+	FileSystem* fs = new RamFS((u8int*)mods[0].mod_start, 1024 * 1024);
 	DirectoryNode* rd;
 	rd = fs->getRootNode();
-	FileNode* f;
+	/*FileNode* f;
 	f = rd->createFile(String("test"));
-	f->write(0, 4, (u8int*)"plop");
+	f->write(0, 4, (u8int*)"plop"); */
+
+	asm volatile("sti");
 
 	while(1) {
 		kvt->setColor(0);
@@ -146,7 +146,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 					Mem::kfree(d);
 					*kvt << "\n";
 				} else if (n->type() == NT_DIRECTORY) {
-					*kvt << "Found directory " << n->getName() << " :\n";
+					*kvt << "Found directory " << n->getName() << ", " << (s32int)n->getLength() << " items.\n";
 				}
 			}
 		} else if (tmp == "reboot") {
diff --git a/Source/Kernel/FileSystems/RamFS/RamFS.class.cpp b/Source/Kernel/FileSystems/RamFS/RamFS.class.cpp
index c8ed27c..f5a502f 100644
--- a/Source/Kernel/FileSystems/RamFS/RamFS.class.cpp
+++ b/Source/Kernel/FileSystems/RamFS/RamFS.class.cpp
@@ -9,6 +9,61 @@ RamFS::RamFS(u32int maxSize) {
 	m_rootNode = new DirectoryNode("/", this, NULL);	
 }
 
+RamFS::RamFS(u8int *ptr, u32int maxSize, bool writable) {
+	m_maxSize = maxSize;
+	m_usedSize = 0;
+	m_isWritable = true;
+	m_rootNode = new DirectoryNode("/", this, NULL);
+
+	union {
+		u8int* c;
+		initrd_header* i;
+		initrd_file_header* f;
+	} curr;
+	curr.c = ptr;
+
+	if (curr.i->magic != INITRD_MAGIC) return;
+	u32int files = curr.i->files;
+	curr.i++;	//Increment pointer of size of initrd header
+	DEBUG_HEX(files); DEBUG(" is initrd file count.");
+	for (u32int i = 0; i < files; i++) {
+		initrd_file_header h = *(curr.f);
+		curr.f++;	//Increment pointer of size of file header
+		if (h.name_length != 0 or h.file_length != 0) {
+			String name((const char*)(curr.c));
+			curr.c += h.name_length + 1;	//Increment pointer of length of name
+
+			//Find out a vector conaining parent directories, and set name to the effective file name
+			if (name[0] == WChar("/")) name = name.substr(1, name.size() - 1);
+
+			//Find node for parent directory
+			String mname = "";
+			DirectoryNode* parent = m_rootNode;
+			for (u32int i = 0; i < name.size(); i++) {
+				if (name[i] == WChar("/")) {
+					FSNode* n = parent->getChild(mname);
+					if (n == NULL) break;
+					if (n->type() != NT_DIRECTORY) break;
+					parent = (DirectoryNode*)n;
+					mname.clear();
+				} else {
+					mname += name[i];
+				}
+			}
+			name = mname;
+
+			//Add new node
+			if (h.file_length == 0) {
+				parent->createDirectory(name);
+			} else {
+				FileNode* file = parent->createFile(name);
+				file->write(0, h.file_length, curr.c);
+				curr.c += h.file_length;
+			}
+		}	
+	}
+}
+
 bool RamFS::setName(FSNode* node, String name) { return true; }
 bool RamFS::setPermissions(FSNode* node, u32int permissions) { return true; }
 bool RamFS::setUid(FSNode* node, u32int uid) { return true; }
diff --git a/Source/Kernel/FileSystems/RamFS/RamFS.class.h b/Source/Kernel/FileSystems/RamFS/RamFS.class.h
index 822dc39..034a948 100644
--- a/Source/Kernel/FileSystems/RamFS/RamFS.class.h
+++ b/Source/Kernel/FileSystems/RamFS/RamFS.class.h
@@ -3,6 +3,18 @@
 
 #include <VFS/FileSystem.proto.h>
 
+struct initrd_header {
+	unsigned int magic;
+	unsigned int files;
+};
+
+struct initrd_file_header {
+	unsigned int name_length;
+	unsigned int file_length;
+};
+
+#define INITRD_MAGIC 0x1337BEEF
+
 class RamFS : public FileSystem {
 	private:
 	u32int m_maxSize;
diff --git a/Source/Kernel/Library/Vector.class.cpp b/Source/Kernel/Library/Vector.class.cpp
index d0c71a4..91196b8 100644
--- a/Source/Kernel/Library/Vector.class.cpp
+++ b/Source/Kernel/Library/Vector.class.cpp
@@ -2,18 +2,22 @@ using namespace CMem;	//strlen and memcpy
 
 template <typename T>
 Vector<T>::Vector() {
+	//DEBUG_HEX((u32int)this); DEBUG(" NEW EMPTY");
+	//DEBUG_HEX(sizeof(T)); DEBUG("  sizeof(T)");
 	m_data = 0;
 	m_size = 0;
 }
 
 template <typename T>
 Vector<T>::Vector(u32int size) {
+	//DEBUG_HEX((u32int)this); DEBUG(" NEW ZERO");
 	m_data = new T[size];
 	m_size = size;
 }
 
 template <typename T>
 Vector<T>::Vector(u32int size, T value) {
+	//DEBUG_HEX((u32int)this); DEBUG(" NEW FILLED");
 	//m_data = (T*)Mem::kalloc(size * sizeof(T));
 	m_data = new T[size](value);
 	m_size = size;
@@ -24,6 +28,7 @@ Vector<T>::Vector(u32int size, T value) {
 
 template <typename T>
 Vector<T>::Vector(const Vector<T> &other) {
+	//DEBUG_HEX((u32int)this); DEBUG(" COPY REF");
 	m_size = other.m_size;
 	m_data = (T*)Mem::kalloc(m_size * sizeof(T));
 	for (u32int i = 0; i < m_size; i++) {
@@ -33,6 +38,7 @@ Vector<T>::Vector(const Vector<T> &other) {
 
 template <typename T>
 Vector<T>& Vector<T>::operator= (const Vector<T> &other) {
+	//DEBUG_HEX((u32int)this); DEBUG(" COPY EQ");
 	if (m_data != 0) delete[] m_data;
 	m_size = other.m_size;
 	m_data = (T*)Mem::kalloc(m_size * sizeof(T));
@@ -43,6 +49,7 @@ Vector<T>& Vector<T>::operator= (const Vector<T> &other) {
 
 template <typename T>
 Vector<T>::~Vector() {
+	//DEBUG_HEX((u32int)this); DEBUG(" DELETE");
 	if (m_data != 0) delete[] m_data;
 }
 
@@ -107,7 +114,7 @@ bool Vector<T>::empty() {
 template <typename T>
 void Vector<T>::clear() {
 	if (empty()) return;
-	Mem::kfree(m_data);
+	delete [] m_data;
 	m_data = 0;
 	m_size = 0;
 }
diff --git a/Source/Kernel/Melon.ke b/Source/Kernel/Melon.ke
index 89d3f81..c9d56ba 100755
--- a/Source/Kernel/Melon.ke
+++ b/Source/Kernel/Melon.ke
diff --git a/Source/Kernel/Ressources/Welcome.txt b/Source/Kernel/Ressources/Welcome.txt
new file mode 100644
index 0000000..97d6755
--- /dev/null
+++ b/Source/Kernel/Ressources/Welcome.txt
@@ -0,0 +1 @@
+Hi, this is a file located on an InitRD ! éàç...
diff --git a/Source/Tools/MakeRamFS/MakeRamFS b/Source/Tools/MakeRamFS/MakeRamFS
index 43a628b..be1dc1a 100755
--- a/Source/Tools/MakeRamFS/MakeRamFS
+++ b/Source/Tools/MakeRamFS/MakeRamFS
diff --git a/Source/Tools/MakeRamFS/main.cpp b/Source/Tools/MakeRamFS/main.cpp
index df1f0d8..dcb2a2b 100644
--- a/Source/Tools/MakeRamFS/main.cpp
+++ b/Source/Tools/MakeRamFS/main.cpp
@@ -50,6 +50,7 @@ int main(int argc, char *argv[]) {
 			fhdr.file_length = 0;	//File length of 0 means directory
 			output.write((char*)&fhdr, sizeof(ramfs_file_header));
 			output << name;
+			output << '\0';
 			continue;
 		}
 		
@@ -75,10 +76,14 @@ int main(int argc, char *argv[]) {
 		output.write((char*)&fhdr, sizeof(ramfs_file_header));
 
 		output << name;
+		output << '\0';
 
 		char *c = new char[fhdr.file_length];
-		infile.read(c, fhdr.file_length);
-		output.write(c, fhdr.file_length);
+		for (int i = 0; i < fhdr.file_length; i++) {
+			char ch;
+			infile.read(&ch, 1);
+			output.write(&ch, 1);
+		}
 		delete [] c;
 
 		infile.close();