Rename user_program to shell.

Author: cstack

Makefile

@@ -58,16 +58,16 @@ kernel.elf: $(OBJECTS) $(STDLIB)
 start_user_program.o: start_user_program.s
 	$(NASM) $(ASFLAGS) $< -o $@
 
-user_program.o: user_program.c
+shell.o: shell.c
 	$(GCC) $(CFLAGS) $< -o $@
 
-user_program.bin: user_program.o start_user_program.o $(STDLIB)
+shell.bin: shell.o start_user_program.o $(STDLIB)
 	$(LD) -T link_user_program.ld -melf_i386 $^ -o $@
 
-built_file_system: file_system_root/* user_program.bin
+built_file_system: file_system_root/* shell.bin
 	script/build_file_system
 
-os.iso: kernel.elf user_program.bin menu.lst built_file_system
+os.iso: kernel.elf shell.bin menu.lst built_file_system
 	mkdir -p iso/boot/grub              # create the folder structure
 	mkdir -p iso/modules
 	cp stage2_eltorito iso/boot/grub/   # copy the bootloader

kmain.c

@@ -137,7 +137,12 @@ void kmain(struct kernel_memory_descriptor_t kernel_memory, uint32_t ebx) {
   initialize_filesystem(first_module(mbinfo));
   fprintf(LOG, "  - done\n");
 
-  struct file_t* file = get_file("user_program.bin");
+  char* file_name = "shell.bin";
+  struct file_t* file = get_file(file_name);
+  if (file == 0) {
+    fprintf(LOG, "ERROR: could not find file %s\n", file_name);
+    while(1){}
+  }
 
   fprintf(LOG, "- Creating a user process...\n");
   create_process(file);

script/build_file_system

@@ -10,7 +10,7 @@ def include_file(path, output_file)
 end
 
 f = File.open('built_file_system', 'w')
-include_file("#{File.dirname(__FILE__)}/../user_program.bin", f)
+include_file("#{File.dirname(__FILE__)}/../shell.bin", f)
 
 dirname = "#{File.dirname(__FILE__)}/../file_system_root"
 Dir.foreach(dirname) do |item|