2003-01-06 Yoshinori K. Okuji <okuji@enbug.org>

* util/i386/pc/pupa-setup.c: Include pupa/machine/kernel.h.
	(setup): Configure the installed partition information and the
	dl prefix.

	* loader/i386/pc/chainloader.c (my_mod): New variable.
	(pupa_chainloader_unload): New function.
	(pupa_rescue_cmd_chainloader): Refer itself.
	(PUPA_MOD_INIT): Save its own module in MY_MOD.

	* kern/i386/pc/startup.S (install_partition): Removed.
	(version_string): Likewise.
	(config_file): Likewise.
	(pupa_install_dos_part): New variable.
	(pupa_install_bsd_part): Likewise.
	(pupa_prefix): Likewise.
	(pupa_chainloader_real_boot): Call pupa_dl_unload_all.

	* kern/i386/pc/init.c: Include pupa/machine/kernel.h, pupa/dl.h
	and pupa/misc.h.
	(make_install_device): New function.
	(pupa_machine_init): Set the dl prefix.

	* kern/rescue.c: Include pupa/rescue.h and pupa/dl.h.
	(buf): Renamed to ...
	(linebuf): ... this.
	(pupa_rescue_cmd_prefix): New function.
	(pupa_rescue_cmd_insmod): Likewise.
	(pupa_rescue_cmd_rmmod): Likewise.
	(pupa_rescue_cmd_lsmod): Likewise.
	(pupa_enter_rescue_mode): Register new commands: prefix, insmod,
	rmmod and lsmod.

	* kern/mm.c (pupa_memalign): If failed even after invalidating
	disk caches, unload unneeded modules and retry.

	* kern/misc.c (pupa_memmove): New function.
	(pupa_memcpy): Removed.
	(pupa_strcpy): New function.
	(pupa_itoa): Made static.

	* kern/dl.c (pupa_dl_iterate): New function.
	(pupa_dl_ref): Likewise.
	(pupa_dl_unref): Likewise.
	(pupa_dl_unload): Return if succeeded or not.
	(pupa_dl_unload_unneeded): New function.
	(pupa_dl_unload_all): Likewise.
	(pupa_dl_init): Renamed to ...
	(pupa_dl_set_prefix): ... this.
	(pupa_dl_get_prefix): New function.

	* include/pupa/i386/pc/kernel.h: Include pupa/types.h.
	(PUPA_KERNEL_MACHINE_INSTALL_DOS_PART): New macro.
	(PUPA_KERNEL_MACHINE_INSTALL_BSD_PART): Likewise.
	(PUPA_KERNEL_MACHINE_PREFIX): Likewise.
	(pupa_install_dos_part): Declared.
	(pupa_install_bsd_part): Likewise.
	(pupa_prefix): Likewise.
	(pupa_boot_drive): Likewise.

	* include/pupa/types.h: Fix a typo.

	* include/pupa/misc.h (pupa_memcpy): New macro. Just an alias to
	pupa_memmove.
	(pupa_memmove): Declared.
	(pupa_strcpy): Likewise.

	* include/pupa/dl.h (PUPA_MOD_INIT): Change the prototype. Now
	pupa_mod_init takes one argument, its own module.
	(pupa_dl_unload_unneeded): Declared.
	(pupa_dl_unload_all): Likewise.
	(pupa_dl_ref): Likewise.
	(pupa_dl_unref): Likewise.
	(pupa_dl_iterate): Likewise.
	(pupa_dl_init): Renamed to ...
	(pupa_dl_set_prefix): ... this.
	(pupa_dl_get_prefix): Declared.

	* fs/fat.c [!PUPA_UTIL] (my_mod): New variable.
	(pupa_fat_dir) [!PUPA_UTIL]: Prevent the fat module from being
	unloaded.
	(pupa_fat_open) [!PUPA_UTIL]: Refer itself if succeeded.
	(pupa_fat_close) [!PUPA_UTIL]: Unrefer itself.

	* configure.ac (tmp_CFLAGS): Added -Wshadow, -Wpointer-arith,
	-Wmissing-prototypes, -Wundef and -Wstrict-prototypes.

loader/i386/pc/chainloader.c

@@ -35,6 +35,8 @@
 /* Allocate space statically, because this is very small anyway.  */
 static char pupa_chainloader_boot_sector[PUPA_DISK_SECTOR_SIZE];
 
+static pupa_dl_t my_mod;
+
 static pupa_err_t
 pupa_chainloader_boot (void)
 {
@@ -75,13 +77,21 @@ pupa_chainloader_boot (void)
   return PUPA_ERR_NONE;
 }
 
+static pupa_err_t
+pupa_chainloader_unload (void)
+{
+  pupa_dl_unref (my_mod);
+}
+
 static void
 pupa_rescue_cmd_chainloader (int argc, char *argv[])
 {
-  pupa_file_t file;
+  pupa_file_t file = 0;
   pupa_uint16_t signature;
   int force = 0;
 
+  pupa_dl_ref (my_mod);
+  
   if (argc > 0 && pupa_strcmp (argv[0], "--force") == 0)
     {
       force = 1;
@@ -92,12 +102,12 @@ pupa_rescue_cmd_chainloader (int argc, char *argv[])
   if (argc == 0)
     {
       pupa_error (PUPA_ERR_BAD_ARGUMENT, "no file specified");
-      return;
+      goto fail;
     }
 
   file = pupa_file_open (argv[0]);
   if (! file)
-    return;
+    goto fail;
 
   /* Read the first block.  */
   if (pupa_file_read (file, pupa_chainloader_boot_sector,
@@ -106,20 +116,28 @@ pupa_rescue_cmd_chainloader (int argc, char *argv[])
       if (pupa_errno == PUPA_ERR_NONE)
 	pupa_error (PUPA_ERR_BAD_OS, "too small");
 
-      pupa_file_close (file);
-      return;
+      goto fail;
     }
 
   /* Check the signature.  */
   signature = *((pupa_uint16_t *) (pupa_chainloader_boot_sector
 				   + PUPA_DISK_SECTOR_SIZE - 2));
   if (signature != pupa_le_to_cpu16 (0xaa55) && ! force)
-    pupa_error (PUPA_ERR_BAD_OS, "invalid signature");
+    {
+      pupa_error (PUPA_ERR_BAD_OS, "invalid signature");
+      goto fail;
+    }
 
   pupa_file_close (file);
+  pupa_loader_set (0, pupa_chainloader_boot, pupa_chainloader_unload);
+  return;
+  
+ fail:
 
-  if (pupa_errno == PUPA_ERR_NONE)
-    pupa_loader_set (0, pupa_chainloader_boot, 0);
+  if (file)
+    pupa_file_close (file);
+  
+  pupa_dl_unref (my_mod);
 }
 
 static const char loader_name[] = "chainloader";
@@ -129,6 +147,7 @@ PUPA_MOD_INIT
   pupa_rescue_register_command (loader_name,
 				pupa_rescue_cmd_chainloader,
 				"load another boot loader");
+  my_mod = mod;
 }
 
 PUPA_MOD_FINI