5f968e1e61
Change the semantics of variable hooks. They now return strings instead of error values. * util/i386/pc/grub-setup.c: Include grub/env.h. (setup): Use grub_device_set_root instead of grub_env_set. * kern/rescue.c (grub_rescue_cmd_root): Use grub_env_set and grub_env_get instead of grub_device_set_root and grub_device_get_root, respectively. * kern/main.c (grub_env_write_root): New function. (grub_set_root_dev): Register grub_env_write_hook for "root". Use grub_env_set instead of grub_device_set_root. * kern/env.c (HASHSZ): Reduced to 13, because GRUB does not need many variables. (grub_env_set): Set ENV->VALUE to the result of ENV->WRITE_HOOK rather than calling ENV->WRITE_HOOK afterwards. (grub_env_get): Return the result of ENV->READ_HOOK rather than passing a pointer of a pointer. (grub_register_variable_hook): Change the types of "read_hook" and "write_hook" to grub_env_read_hook_t and grub_env_write_hook_t, respectively. Allocate the default empty string on the heap, because this string may be freed later. * kern/device.c: Include grub/env.h. (grub_device_set_root): Removed. (grub_device_get_root): Likewise. (grub_device_open): Use grub_env_get instead of grub_device_get_root. * include/grub/env.h (grub_env_read_hook_t): New type. (grub_env_write_hook_t): Likewise. (grub_env_var): Change the types of "read_hook" and "write_hook" to grub_env_read_hook_t and grub_env_write_hook_t, respectively. (grub_register_variable_hook): Likewise. * include/grub/device.h (grub_device_set_root): Removed. (grub_device_set_root): Likewise. * fs/fat.c (grub_fat_dir): Make a copy of PATH in DIRNAME, and make sure that DIRNAME terminates with '/', so that grub_fat_find_dir will fail if PATH is not a directory. * commands/ls.c (grub_ls_list_files): Remove the qualifier const from DIRNAME. Use the qualifier auto for print_files and print_files_long. If FS->DIR sets GRUB_ERRNO to GRUB_ERR_BAD_FILE_TYPE, try DIRNAME as a regular file. Put a newline only if there is no error. (grub_cmd_ls): Remove grub_ls_print_files, because this is not used.
80 lines
1.8 KiB
C
80 lines
1.8 KiB
C
/* device.c - device manager */
|
|
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2002,2005 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GRUB; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <grub/device.h>
|
|
#include <grub/disk.h>
|
|
#include <grub/net.h>
|
|
#include <grub/fs.h>
|
|
#include <grub/mm.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/env.h>
|
|
|
|
grub_device_t
|
|
grub_device_open (const char *name)
|
|
{
|
|
grub_disk_t disk = 0;
|
|
grub_device_t dev = 0;
|
|
|
|
if (! name)
|
|
{
|
|
name = grub_env_get ("root");
|
|
if (*name == '\0')
|
|
{
|
|
grub_error (GRUB_ERR_BAD_DEVICE, "no device is set");
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
dev = grub_malloc (sizeof (*dev));
|
|
if (! dev)
|
|
goto fail;
|
|
|
|
/* Try to open a disk. */
|
|
disk = grub_disk_open (name);
|
|
if (! disk)
|
|
{
|
|
grub_error (GRUB_ERR_BAD_DEVICE, "unknown device");
|
|
goto fail;
|
|
}
|
|
|
|
dev->disk = disk;
|
|
dev->net = 0; /* FIXME */
|
|
|
|
return dev;
|
|
|
|
fail:
|
|
if (disk)
|
|
grub_disk_close (disk);
|
|
|
|
grub_free (dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
grub_err_t
|
|
grub_device_close (grub_device_t device)
|
|
{
|
|
if (device->disk)
|
|
grub_disk_close (device->disk);
|
|
|
|
grub_free (device);
|
|
|
|
return grub_errno;
|
|
}
|