Parse multiple files.

Author: cstack

Makefile

@@ -63,7 +63,7 @@ user_program.o: user_program.c
 user_program.bin: user_program.o start_user_program.o $(STDLIB)
 	$(LD) -T link_user_program.ld -melf_i386 $^ -o $@
 
-built_file_system: file_system_root/*
+built_file_system: file_system_root/* user_program.bin
 	script/build_file_system
 
 os.iso: kernel.elf user_program.bin menu.lst built_file_system

filesystem.c

@@ -5,45 +5,63 @@
 #include "stdlib.h"
 #include "string.h"
 
-struct file_t* f;
+struct file_t* first_file;
+struct file_t* last_file;
 
-void initialize_filesystem(struct module* mod) {
-  void* mod_virtual_start = (void*) (mod->mod_start + UPPER_GB_START);
-
-  char* cursor = (char*) mod_virtual_start;
-
-  if (strncmp(cursor, "FILE ", 5) != 0) {
+struct file_t* parse_file(char** cursor) {
+  if (strncmp(*cursor, "FILE ", 5) != 0) {
     fprintf(LOG, "ERROR: First bytes of metadata should be `FILE ` but were `");
     for (int i = 0; i < 5; i++) {
-      fprintf(LOG, "%c", cursor[i]);
+      fprintf(LOG, "%c", (*cursor)[i]);
     }
     fprintf(LOG, "`\n");
-    fprintf(LOG, "strncmp returned %i\n", strncmp(cursor, "FILE ", 5));
+    fprintf(LOG, "strncmp returned %i\n", strncmp(*cursor, "FILE ", 5));
     fprintf(LOG, "cursor: %s", cursor);
+    while(1){}
   }
-  cursor += 5;
+  (*cursor) += 5;
 
   struct file_t* file = malloc(sizeof(struct file_t));
 
   uint32_t file_name_length = 0;
-  while (*cursor != ' ' && file_name_length < FILE_NAME_MAX_LENGTH) {
-    file->name[file_name_length] = *cursor;
-    cursor++;
+  while (*(*cursor) != ' ' && file_name_length < FILE_NAME_MAX_LENGTH) {
+    file->name[file_name_length] = *(*cursor);
+    (*cursor)++;
     file_name_length++;
   }
-  cursor++;
+  (*cursor)++;
 
-  uint32_t file_size = atoi(cursor);
+  uint32_t file_size = atoi(*cursor);
   file->size = file_size;
-  while (*cursor != '\n') {
-    cursor++;
+  while (*(*cursor) != '\n') {
+    (*cursor)++;
   }
-  cursor++;
-  file->bytes = cursor;
+  (*cursor)++;
+  file->bytes = (*cursor);
+
+  (*cursor) += file->size + 1;
+
+  return file;
+}
 
-  f = file;
+void initialize_filesystem(struct module* mod) {
+  void* mod_virtual_start = (void*) (mod->mod_start + UPPER_GB_START);
+  char* mod_virtual_end = (mod->mod_end + UPPER_GB_START);
+  char* cursor = (char*) mod_virtual_start;
+
+  while (cursor < mod_virtual_end) {
+    struct file_t* new_file = parse_file(&cursor);
+    if (!first_file) {
+      first_file = new_file;
+    }
+    if (last_file) {
+      last_file->next_sibling = new_file;
+    } else {
+      last_file = new_file;
+    }
+  }
 }
 
 struct file_t* get_file() {
-  return f;
+  return first_file;
 }

interrupts.c

@@ -64,7 +64,6 @@ void interrupt_handler(struct cpu_state cpu, uint32_t interrupt_number, uint32_t
       keyboard_interrupt_handler();
       break;
     case(INT_PAGE_FAULT):
-      log_interrupt_details("INT_PAGE_FAULT", error_code, eip, &cpu);
       if ((error_code & 0b1) == 0) {
         // Caused by page-not-present
         page_in((void*) cpu.cr2);

kmain.c

@@ -138,9 +138,11 @@ void kmain(struct kernel_memory_descriptor_t kernel_memory, uint32_t ebx) {
   fprintf(LOG, "  - done\n");
 
   struct file_t* file = get_file();
-  fprintf(LOG, "Name of file: %s\n", file->name);
-  fprintf(LOG, "Size of file: %i\n", file->size);
-  fprintf(LOG, "Contents of file:\n----\n%s\n----\n", file->bytes);
+
+  while (file) {
+    fprintf(LOG, "%s (%i bytes)\n----\n%s\n----\n", file->name, file->size, file->bytes);
+    file = file->next_sibling;
+  }
 
   // fprintf(LOG, "- Creating a user process...\n");
   // create_process(first_module(mbinfo));

script/build_file_system

@@ -1,13 +1,21 @@
 #!/usr/bin/env ruby
-dirname = "#{File.dirname(__FILE__)}/../file_system_root"
+
+def include_file(path, output_file)
+  f2 = File.open(path)
+  filename = path.split("/").last
+  output_file.write("FILE #{filename} #{f2.size}\n")
+  output_file.write(f2.read)
+  output_file.write("\n")
+  f2.close
+end
+
 f = File.open('built_file_system', 'w')
+include_file("#{File.dirname(__FILE__)}/../user_program.bin", f)
+
+dirname = "#{File.dirname(__FILE__)}/../file_system_root"
 Dir.foreach(dirname) do |item|
   next if item == '.' or item == '..'
-  f2 = File.open("#{dirname}/#{item}")
-  f.write("FILE #{item} #{f2.size}\n")
-  f.write(f2.read)
-  f.write("\n")
-  f2.close
+  include_file("#{dirname}/#{item}", f)
 end
 
 f.close