2004-11-01 16:14:16 +00:00
|
|
|
|
/* iso9660.c - iso9660 implementation with extensions:
|
|
|
|
|
SUSP, Rock Ridge. */
|
|
|
|
|
/*
|
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2010-01-04 22:47:30 +00:00
|
|
|
|
* Copyright (C) 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
|
2004-11-01 16:14:16 +00:00
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2004-11-01 16:14:16 +00:00
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2004-11-01 16:14:16 +00:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2004-11-01 16:14:16 +00:00
|
|
|
|
* 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
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2004-11-01 16:14:16 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <grub/err.h>
|
|
|
|
|
#include <grub/file.h>
|
|
|
|
|
#include <grub/mm.h>
|
|
|
|
|
#include <grub/misc.h>
|
|
|
|
|
#include <grub/disk.h>
|
|
|
|
|
#include <grub/dl.h>
|
|
|
|
|
#include <grub/types.h>
|
|
|
|
|
#include <grub/fshelp.h>
|
2009-11-09 17:43:53 +00:00
|
|
|
|
#include <grub/charset.h>
|
2010-12-10 09:32:50 +00:00
|
|
|
|
#include <grub/datetime.h>
|
2004-11-01 16:14:16 +00:00
|
|
|
|
|
2011-04-11 21:01:51 +00:00
|
|
|
|
GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
#define GRUB_ISO9660_FSTYPE_DIR 0040000
|
|
|
|
|
#define GRUB_ISO9660_FSTYPE_REG 0100000
|
|
|
|
|
#define GRUB_ISO9660_FSTYPE_SYMLINK 0120000
|
|
|
|
|
#define GRUB_ISO9660_FSTYPE_MASK 0170000
|
|
|
|
|
|
|
|
|
|
#define GRUB_ISO9660_LOG2_BLKSZ 2
|
|
|
|
|
#define GRUB_ISO9660_BLKSZ 2048
|
|
|
|
|
|
|
|
|
|
#define GRUB_ISO9660_RR_DOT 2
|
|
|
|
|
#define GRUB_ISO9660_RR_DOTDOT 4
|
|
|
|
|
|
2008-02-24 15:34:15 +00:00
|
|
|
|
#define GRUB_ISO9660_VOLDESC_BOOT 0
|
|
|
|
|
#define GRUB_ISO9660_VOLDESC_PRIMARY 1
|
|
|
|
|
#define GRUB_ISO9660_VOLDESC_SUPP 2
|
|
|
|
|
#define GRUB_ISO9660_VOLDESC_PART 3
|
|
|
|
|
#define GRUB_ISO9660_VOLDESC_END 255
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* The head of a volume descriptor. */
|
|
|
|
|
struct grub_iso9660_voldesc
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t type;
|
|
|
|
|
grub_uint8_t magic[5];
|
|
|
|
|
grub_uint8_t version;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
2010-12-10 10:12:59 +00:00
|
|
|
|
struct grub_iso9660_date2
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t year;
|
|
|
|
|
grub_uint8_t month;
|
|
|
|
|
grub_uint8_t day;
|
|
|
|
|
grub_uint8_t hour;
|
|
|
|
|
grub_uint8_t minute;
|
|
|
|
|
grub_uint8_t second;
|
|
|
|
|
grub_uint8_t offset;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* A directory entry. */
|
|
|
|
|
struct grub_iso9660_dir
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t len;
|
|
|
|
|
grub_uint8_t ext_sectors;
|
|
|
|
|
grub_uint32_t first_sector;
|
|
|
|
|
grub_uint32_t first_sector_be;
|
|
|
|
|
grub_uint32_t size;
|
|
|
|
|
grub_uint32_t size_be;
|
2010-12-10 10:12:59 +00:00
|
|
|
|
struct grub_iso9660_date2 mtime;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_uint8_t flags;
|
|
|
|
|
grub_uint8_t unused2[6];
|
|
|
|
|
grub_uint8_t namelen;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
2008-09-06 11:16:52 +00:00
|
|
|
|
struct grub_iso9660_date
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t year[4];
|
|
|
|
|
grub_uint8_t month[2];
|
|
|
|
|
grub_uint8_t day[2];
|
|
|
|
|
grub_uint8_t hour[2];
|
|
|
|
|
grub_uint8_t minute[2];
|
|
|
|
|
grub_uint8_t second[2];
|
|
|
|
|
grub_uint8_t hundredth[2];
|
|
|
|
|
grub_uint8_t offset;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* The primary volume descriptor. Only little endian is used. */
|
|
|
|
|
struct grub_iso9660_primary_voldesc
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_voldesc voldesc;
|
|
|
|
|
grub_uint8_t unused1[33];
|
|
|
|
|
grub_uint8_t volname[32];
|
2008-02-24 15:34:15 +00:00
|
|
|
|
grub_uint8_t unused2[16];
|
|
|
|
|
grub_uint8_t escape[32];
|
|
|
|
|
grub_uint8_t unused3[12];
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_uint32_t path_table_size;
|
2008-02-24 15:34:15 +00:00
|
|
|
|
grub_uint8_t unused4[4];
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_uint32_t path_table;
|
2008-02-24 15:34:15 +00:00
|
|
|
|
grub_uint8_t unused5[12];
|
2004-11-01 16:14:16 +00:00
|
|
|
|
struct grub_iso9660_dir rootdir;
|
2008-09-28 15:22:28 +00:00
|
|
|
|
grub_uint8_t unused6[624];
|
2008-09-06 11:16:52 +00:00
|
|
|
|
struct grub_iso9660_date created;
|
2008-09-28 15:22:28 +00:00
|
|
|
|
struct grub_iso9660_date modified;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* A single entry in the path table. */
|
|
|
|
|
struct grub_iso9660_path
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t len;
|
|
|
|
|
grub_uint8_t sectors;
|
|
|
|
|
grub_uint32_t first_sector;
|
|
|
|
|
grub_uint16_t parentdir;
|
|
|
|
|
grub_uint8_t name[0];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* An entry in the System Usage area of the directory entry. */
|
|
|
|
|
struct grub_iso9660_susp_entry
|
|
|
|
|
{
|
|
|
|
|
grub_uint8_t sig[2];
|
|
|
|
|
grub_uint8_t len;
|
|
|
|
|
grub_uint8_t version;
|
|
|
|
|
grub_uint8_t data[0];
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
/* The CE entry. This is used to describe the next block where data
|
|
|
|
|
can be found. */
|
|
|
|
|
struct grub_iso9660_susp_ce
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_susp_entry entry;
|
|
|
|
|
grub_uint32_t blk;
|
|
|
|
|
grub_uint32_t blk_be;
|
|
|
|
|
grub_uint32_t off;
|
|
|
|
|
grub_uint32_t off_be;
|
|
|
|
|
grub_uint32_t len;
|
|
|
|
|
grub_uint32_t len_be;
|
|
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
|
|
|
|
struct grub_iso9660_data
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_primary_voldesc voldesc;
|
|
|
|
|
grub_disk_t disk;
|
|
|
|
|
int rockridge;
|
|
|
|
|
int susp_skip;
|
2008-02-24 15:34:15 +00:00
|
|
|
|
int joliet;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
struct grub_fshelp_node *node;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct grub_fshelp_node
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_data *data;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
grub_size_t have_dirents, alloc_dirents;
|
2011-11-10 08:31:06 +00:00
|
|
|
|
int have_symlink;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
struct grub_iso9660_dir dirents[8];
|
2011-11-10 08:31:06 +00:00
|
|
|
|
char symlink[0];
|
2004-11-01 16:14:16 +00:00
|
|
|
|
};
|
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
enum
|
|
|
|
|
{
|
|
|
|
|
FLAG_TYPE_PLAIN = 0,
|
|
|
|
|
FLAG_TYPE_DIR = 2,
|
|
|
|
|
FLAG_TYPE = 3,
|
|
|
|
|
FLAG_MORE_EXTENTS = 0x80
|
|
|
|
|
};
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
static grub_dl_t my_mod;
|
|
|
|
|
|
|
|
|
|
|
2010-12-10 09:32:50 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
iso9660_to_unixtime (const struct grub_iso9660_date *i, grub_int32_t *nix)
|
|
|
|
|
{
|
|
|
|
|
struct grub_datetime datetime;
|
|
|
|
|
|
|
|
|
|
if (! i->year[0] && ! i->year[1]
|
|
|
|
|
&& ! i->year[2] && ! i->year[3]
|
|
|
|
|
&& ! i->month[0] && ! i->month[1]
|
|
|
|
|
&& ! i->day[0] && ! i->day[1]
|
|
|
|
|
&& ! i->hour[0] && ! i->hour[1]
|
|
|
|
|
&& ! i->minute[0] && ! i->minute[1]
|
|
|
|
|
&& ! i->second[0] && ! i->second[1]
|
|
|
|
|
&& ! i->hundredth[0] && ! i->hundredth[1])
|
|
|
|
|
return grub_error (GRUB_ERR_BAD_NUMBER, "empty date");
|
|
|
|
|
datetime.year = (i->year[0] - '0') * 1000 + (i->year[1] - '0') * 100
|
|
|
|
|
+ (i->year[2] - '0') * 10 + (i->year[3] - '0');
|
|
|
|
|
datetime.month = (i->month[0] - '0') * 10 + (i->month[1] - '0');
|
|
|
|
|
datetime.day = (i->day[0] - '0') * 10 + (i->day[1] - '0');
|
|
|
|
|
datetime.hour = (i->hour[0] - '0') * 10 + (i->hour[1] - '0');
|
|
|
|
|
datetime.minute = (i->minute[0] - '0') * 10 + (i->minute[1] - '0');
|
|
|
|
|
datetime.second = (i->second[0] - '0') * 10 + (i->second[1] - '0');
|
|
|
|
|
|
2010-12-10 16:37:32 +00:00
|
|
|
|
if (!grub_datetime2unixtime (&datetime, nix))
|
|
|
|
|
return grub_error (GRUB_ERR_BAD_NUMBER, "incorrect date");
|
2010-12-10 09:32:50 +00:00
|
|
|
|
*nix -= i->offset * 60 * 15;
|
2010-12-10 16:37:32 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2010-12-10 09:32:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-12-10 16:37:32 +00:00
|
|
|
|
static int
|
2010-12-10 10:12:59 +00:00
|
|
|
|
iso9660_to_unixtime2 (const struct grub_iso9660_date2 *i, grub_int32_t *nix)
|
|
|
|
|
{
|
|
|
|
|
struct grub_datetime datetime;
|
2010-12-10 16:37:32 +00:00
|
|
|
|
|
2010-12-10 10:12:59 +00:00
|
|
|
|
datetime.year = i->year + 1900;
|
|
|
|
|
datetime.month = i->month;
|
|
|
|
|
datetime.day = i->day;
|
|
|
|
|
datetime.hour = i->hour;
|
|
|
|
|
datetime.minute = i->minute;
|
|
|
|
|
datetime.second = i->second;
|
|
|
|
|
|
2010-12-10 16:37:32 +00:00
|
|
|
|
if (!grub_datetime2unixtime (&datetime, nix))
|
|
|
|
|
return 0;
|
2010-12-10 10:12:59 +00:00
|
|
|
|
*nix -= i->offset * 60 * 15;
|
2010-12-10 16:37:32 +00:00
|
|
|
|
return 1;
|
2010-12-10 10:12:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
read_node (grub_fshelp_node_t node, grub_off_t off, grub_size_t len, char *buf)
|
|
|
|
|
{
|
|
|
|
|
grub_size_t i = 0;
|
|
|
|
|
|
|
|
|
|
while (len > 0)
|
|
|
|
|
{
|
|
|
|
|
grub_size_t toread;
|
|
|
|
|
grub_err_t err;
|
|
|
|
|
while (i < node->have_dirents
|
|
|
|
|
&& off >= grub_le_to_cpu32 (node->dirents[i].size))
|
|
|
|
|
{
|
|
|
|
|
off -= grub_le_to_cpu32 (node->dirents[i].size);
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
if (i == node->have_dirents)
|
|
|
|
|
return grub_error (GRUB_ERR_OUT_OF_RANGE, "read out of range");
|
|
|
|
|
toread = grub_le_to_cpu32 (node->dirents[i].size);
|
|
|
|
|
if (toread > len)
|
|
|
|
|
toread = len;
|
|
|
|
|
err = grub_disk_read (node->data->disk,
|
|
|
|
|
((grub_disk_addr_t) grub_le_to_cpu32 (node->dirents[i].first_sector)) << GRUB_ISO9660_LOG2_BLKSZ,
|
|
|
|
|
off, toread, buf);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
len -= toread;
|
|
|
|
|
off += toread;
|
|
|
|
|
buf += toread;
|
|
|
|
|
}
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Iterate over the susp entries, starting with block SUA_BLOCK on the
|
|
|
|
|
offset SUA_POS with a size of SUA_SIZE bytes. Hook is called for
|
|
|
|
|
every entry. */
|
|
|
|
|
static grub_err_t
|
2011-10-25 16:18:58 +00:00
|
|
|
|
grub_iso9660_susp_iterate (grub_fshelp_node_t node, grub_off_t off,
|
2011-10-25 19:52:48 +00:00
|
|
|
|
grub_ssize_t sua_size,
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_err_t (*hook)
|
|
|
|
|
(struct grub_iso9660_susp_entry *entry))
|
|
|
|
|
{
|
|
|
|
|
char *sua;
|
|
|
|
|
struct grub_iso9660_susp_entry *entry;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
grub_disk_addr_t ce_block;
|
|
|
|
|
int is_ce = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
auto grub_err_t load_sua (void);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Load a part of the System Usage Area. */
|
|
|
|
|
grub_err_t load_sua (void)
|
|
|
|
|
{
|
2011-10-25 16:18:58 +00:00
|
|
|
|
grub_err_t err;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
sua = grub_malloc (sua_size);
|
|
|
|
|
if (!sua)
|
|
|
|
|
return grub_errno;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
if (is_ce)
|
|
|
|
|
err = grub_disk_read (node->data->disk, ce_block, off,
|
|
|
|
|
sua_size, sua);
|
|
|
|
|
else
|
|
|
|
|
err = read_node (node, off, sua_size, sua);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
entry = (struct grub_iso9660_susp_entry *) sua;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2011-10-25 19:52:48 +00:00
|
|
|
|
if (sua_size <= 0)
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
if (load_sua ())
|
|
|
|
|
return grub_errno;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2013-01-03 20:27:00 +00:00
|
|
|
|
for (; (char *) entry < (char *) sua + sua_size - 1 && entry->len > 0;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
entry = (struct grub_iso9660_susp_entry *)
|
|
|
|
|
((char *) entry + entry->len))
|
|
|
|
|
{
|
|
|
|
|
/* The last entry. */
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
if (grub_strncmp ((char *) entry->sig, "ST", 2) == 0)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
break;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Additional entries are stored elsewhere. */
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
if (grub_strncmp ((char *) entry->sig, "CE", 2) == 0)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_susp_ce *ce;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
is_ce = 1;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
ce = (struct grub_iso9660_susp_ce *) entry;
|
|
|
|
|
sua_size = grub_le_to_cpu32 (ce->len);
|
2011-10-25 16:18:58 +00:00
|
|
|
|
off = grub_le_to_cpu32 (ce->off);
|
|
|
|
|
ce_block = grub_le_to_cpu32 (ce->blk) << GRUB_ISO9660_LOG2_BLKSZ;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_free (sua);
|
|
|
|
|
if (load_sua ())
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
if (hook (entry))
|
|
|
|
|
{
|
|
|
|
|
grub_free (sua);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_free (sua);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-24 15:34:15 +00:00
|
|
|
|
static char *
|
2011-12-13 15:35:12 +00:00
|
|
|
|
grub_iso9660_convert_string (grub_uint8_t *us, int len)
|
2008-02-24 15:34:15 +00:00
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
int i;
|
2011-12-13 15:35:12 +00:00
|
|
|
|
grub_uint16_t t[len];
|
2008-02-24 15:34:15 +00:00
|
|
|
|
|
2011-12-13 15:35:12 +00:00
|
|
|
|
p = grub_malloc (len * GRUB_MAX_UTF8_PER_UTF16 + 1);
|
2008-02-24 15:34:15 +00:00
|
|
|
|
if (! p)
|
|
|
|
|
return p;
|
|
|
|
|
|
|
|
|
|
for (i=0; i<len; i++)
|
2011-12-13 15:35:12 +00:00
|
|
|
|
t[i] = grub_be_to_cpu16 (grub_get_unaligned16 (us + 2 * i));
|
2008-02-24 15:34:15 +00:00
|
|
|
|
|
2011-12-13 15:35:12 +00:00
|
|
|
|
*grub_utf16_to_utf8 ((grub_uint8_t *) p, t, len) = '\0';
|
2008-02-24 15:34:15 +00:00
|
|
|
|
|
|
|
|
|
return p;
|
|
|
|
|
}
|
2004-11-01 16:14:16 +00:00
|
|
|
|
|
2011-10-28 14:26:17 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
set_rockridge (struct grub_iso9660_data *data)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
int sua_pos;
|
|
|
|
|
int sua_size;
|
|
|
|
|
char *sua;
|
2011-10-28 14:26:17 +00:00
|
|
|
|
struct grub_iso9660_dir rootdir;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
struct grub_iso9660_susp_entry *entry;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
auto grub_err_t susp_iterate (struct grub_iso9660_susp_entry *);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_err_t susp_iterate (struct grub_iso9660_susp_entry *susp_entry)
|
|
|
|
|
{
|
|
|
|
|
/* The "ER" entry is used to detect extensions. The
|
|
|
|
|
`IEEE_P1285' extension means Rock ridge. */
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
if (grub_strncmp ((char *) susp_entry->sig, "ER", 2) == 0)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
data->rockridge = 1;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2011-10-28 14:26:17 +00:00
|
|
|
|
data->rockridge = 0;
|
2008-02-24 15:34:15 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Read the system use area and test it to see if SUSP is
|
|
|
|
|
supported. */
|
2011-10-28 14:26:17 +00:00
|
|
|
|
if (grub_disk_read (data->disk,
|
|
|
|
|
(grub_le_to_cpu32 (data->voldesc.rootdir.first_sector)
|
|
|
|
|
<< GRUB_ISO9660_LOG2_BLKSZ), 0,
|
2004-11-01 16:14:16 +00:00
|
|
|
|
sizeof (rootdir), (char *) &rootdir))
|
2011-10-28 14:26:17 +00:00
|
|
|
|
return grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem");
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
sua_pos = (sizeof (rootdir) + rootdir.namelen
|
|
|
|
|
+ (rootdir.namelen % 2) - 1);
|
|
|
|
|
sua_size = rootdir.len - sua_pos;
|
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
if (!sua_size)
|
2011-10-28 14:26:17 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
sua = grub_malloc (sua_size);
|
2006-06-05 17:18:31 +00:00
|
|
|
|
if (! sua)
|
2011-10-28 14:26:17 +00:00
|
|
|
|
return grub_errno;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2011-10-28 14:26:17 +00:00
|
|
|
|
if (grub_disk_read (data->disk,
|
|
|
|
|
(grub_le_to_cpu32 (data->voldesc.rootdir.first_sector)
|
|
|
|
|
<< GRUB_ISO9660_LOG2_BLKSZ), sua_pos,
|
2004-11-01 16:14:16 +00:00
|
|
|
|
sua_size, sua))
|
2011-10-30 19:23:05 +00:00
|
|
|
|
{
|
|
|
|
|
grub_free (sua);
|
|
|
|
|
return grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem");
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
entry = (struct grub_iso9660_susp_entry *) sua;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Test if the SUSP protocol is used on this filesystem. */
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
if (grub_strncmp ((char *) entry->sig, "SP", 2) == 0)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
2011-10-25 16:18:58 +00:00
|
|
|
|
struct grub_fshelp_node rootnode;
|
|
|
|
|
|
|
|
|
|
rootnode.data = data;
|
2011-11-10 08:31:06 +00:00
|
|
|
|
rootnode.alloc_dirents = ARRAY_SIZE (rootnode.dirents);
|
2011-10-25 16:18:58 +00:00
|
|
|
|
rootnode.have_dirents = 1;
|
2011-11-10 08:31:06 +00:00
|
|
|
|
rootnode.have_symlink = 0;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
rootnode.dirents[0] = data->voldesc.rootdir;
|
|
|
|
|
|
2007-12-30 08:52:06 +00:00
|
|
|
|
/* The 2nd data byte stored how many bytes are skipped every time
|
2004-11-01 16:14:16 +00:00
|
|
|
|
to get to the SUA (System Usage Area). */
|
|
|
|
|
data->susp_skip = entry->data[2];
|
|
|
|
|
entry = (struct grub_iso9660_susp_entry *) ((char *) entry + entry->len);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Iterate over the entries in the SUA area to detect
|
2007-12-30 08:52:06 +00:00
|
|
|
|
extensions. */
|
2011-10-25 16:18:58 +00:00
|
|
|
|
if (grub_iso9660_susp_iterate (&rootnode,
|
2004-11-01 16:14:16 +00:00
|
|
|
|
sua_pos, sua_size, susp_iterate))
|
2011-10-30 19:23:05 +00:00
|
|
|
|
{
|
|
|
|
|
grub_free (sua);
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
2004-11-01 16:14:16 +00:00
|
|
|
|
}
|
2011-10-30 19:23:05 +00:00
|
|
|
|
grub_free (sua);
|
2011-10-28 14:26:17 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct grub_iso9660_data *
|
|
|
|
|
grub_iso9660_mount (grub_disk_t disk)
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_data *data = 0;
|
|
|
|
|
struct grub_iso9660_primary_voldesc voldesc;
|
|
|
|
|
int block;
|
|
|
|
|
|
|
|
|
|
data = grub_zalloc (sizeof (struct grub_iso9660_data));
|
|
|
|
|
if (! data)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
data->disk = disk;
|
|
|
|
|
|
|
|
|
|
block = 16;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
int copy_voldesc = 0;
|
|
|
|
|
|
|
|
|
|
/* Read the superblock. */
|
|
|
|
|
if (grub_disk_read (disk, block << GRUB_ISO9660_LOG2_BLKSZ, 0,
|
|
|
|
|
sizeof (struct grub_iso9660_primary_voldesc),
|
|
|
|
|
(char *) &voldesc))
|
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem");
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (grub_strncmp ((char *) voldesc.voldesc.magic, "CD001", 5) != 0)
|
|
|
|
|
{
|
|
|
|
|
grub_error (GRUB_ERR_BAD_FS, "not a ISO9660 filesystem");
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (voldesc.voldesc.type == GRUB_ISO9660_VOLDESC_PRIMARY)
|
|
|
|
|
copy_voldesc = 1;
|
|
|
|
|
else if (!data->rockridge
|
|
|
|
|
&& (voldesc.voldesc.type == GRUB_ISO9660_VOLDESC_SUPP)
|
|
|
|
|
&& (voldesc.escape[0] == 0x25) && (voldesc.escape[1] == 0x2f)
|
|
|
|
|
&&
|
|
|
|
|
((voldesc.escape[2] == 0x40) || /* UCS-2 Level 1. */
|
|
|
|
|
(voldesc.escape[2] == 0x43) || /* UCS-2 Level 2. */
|
|
|
|
|
(voldesc.escape[2] == 0x45))) /* UCS-2 Level 3. */
|
|
|
|
|
{
|
|
|
|
|
copy_voldesc = 1;
|
|
|
|
|
data->joliet = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (copy_voldesc)
|
|
|
|
|
{
|
|
|
|
|
grub_memcpy((char *) &data->voldesc, (char *) &voldesc,
|
|
|
|
|
sizeof (struct grub_iso9660_primary_voldesc));
|
|
|
|
|
if (set_rockridge (data))
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
block++;
|
|
|
|
|
} while (voldesc.voldesc.type != GRUB_ISO9660_VOLDESC_END);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
return data;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
fail:
|
|
|
|
|
grub_free (data);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
grub_iso9660_read_symlink (grub_fshelp_node_t node)
|
|
|
|
|
{
|
2011-11-10 08:31:06 +00:00
|
|
|
|
return node->have_symlink
|
|
|
|
|
? grub_strdup (node->symlink
|
|
|
|
|
+ (node->have_dirents) * sizeof (node->dirents[0])
|
|
|
|
|
- sizeof (node->dirents)) : grub_strdup ("");
|
2004-11-01 16:14:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
static grub_off_t
|
|
|
|
|
get_node_size (grub_fshelp_node_t node)
|
|
|
|
|
{
|
|
|
|
|
grub_off_t ret = 0;
|
|
|
|
|
grub_size_t i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < node->have_dirents; i++)
|
|
|
|
|
ret += grub_le_to_cpu32 (node->dirents[i].size);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
2004-11-01 16:14:16 +00:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
|
2013-01-21 01:33:46 +00:00
|
|
|
|
grub_fshelp_iterate_dir_hook_t hook, void *hook_data)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_dir dirent;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
grub_off_t offset = 0;
|
2011-10-30 19:23:05 +00:00
|
|
|
|
char *filename = 0;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
int filename_alloc = 0;
|
|
|
|
|
enum grub_fshelp_filetype type;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
grub_off_t len;
|
2011-10-25 19:52:48 +00:00
|
|
|
|
char *symlink = 0;
|
2012-05-10 21:35:03 +00:00
|
|
|
|
int was_continue = 0;
|
2011-10-25 19:52:48 +00:00
|
|
|
|
|
|
|
|
|
/* Extend the symlink. */
|
2011-12-13 15:33:27 +00:00
|
|
|
|
auto inline void __attribute__ ((always_inline)) add_part (const char *part,
|
|
|
|
|
int len2);
|
|
|
|
|
|
|
|
|
|
auto inline void __attribute__ ((always_inline)) add_part (const char *part,
|
|
|
|
|
int len2)
|
2011-10-25 19:52:48 +00:00
|
|
|
|
{
|
|
|
|
|
int size = symlink ? grub_strlen (symlink) : 0;
|
|
|
|
|
|
|
|
|
|
symlink = grub_realloc (symlink, size + len2 + 1);
|
|
|
|
|
if (! symlink)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
symlink[size] = 0;
|
|
|
|
|
grub_strncat (symlink, part, len2);
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
auto grub_err_t susp_iterate_dir (struct grub_iso9660_susp_entry *);
|
|
|
|
|
|
|
|
|
|
grub_err_t susp_iterate_dir (struct grub_iso9660_susp_entry *entry)
|
|
|
|
|
{
|
|
|
|
|
/* The filename in the rock ridge entry. */
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
if (grub_strncmp ("NM", (char *) entry->sig, 2) == 0)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
/* The flags are stored at the data position 0, here the
|
|
|
|
|
filename type is stored. */
|
2012-02-10 15:48:48 +00:00
|
|
|
|
/* FIXME: Fix this slightly improper cast. */
|
2004-11-01 16:14:16 +00:00
|
|
|
|
if (entry->data[0] & GRUB_ISO9660_RR_DOT)
|
2012-02-10 15:48:48 +00:00
|
|
|
|
filename = (char *) ".";
|
2004-11-01 16:14:16 +00:00
|
|
|
|
else if (entry->data[0] & GRUB_ISO9660_RR_DOTDOT)
|
2012-02-10 15:48:48 +00:00
|
|
|
|
filename = (char *) "..";
|
2011-10-30 19:23:05 +00:00
|
|
|
|
else if (entry->len >= 5)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
2011-11-10 07:16:27 +00:00
|
|
|
|
grub_size_t size = 1, csize = 1;
|
2011-10-30 19:23:05 +00:00
|
|
|
|
char *old;
|
2011-11-10 07:16:27 +00:00
|
|
|
|
csize = size = entry->len - 5;
|
2011-10-30 19:23:05 +00:00
|
|
|
|
old = filename;
|
|
|
|
|
if (filename_alloc)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
size += grub_strlen (filename);
|
2011-10-30 19:23:05 +00:00
|
|
|
|
filename = grub_realloc (filename, size + 1);
|
2004-11-01 16:14:16 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2011-10-30 19:23:05 +00:00
|
|
|
|
filename_alloc = 1;
|
2009-07-16 22:14:09 +00:00
|
|
|
|
filename = grub_zalloc (size + 1);
|
2011-10-30 19:23:05 +00:00
|
|
|
|
filename[0] = 0;
|
|
|
|
|
}
|
|
|
|
|
if (!filename)
|
|
|
|
|
{
|
|
|
|
|
filename = old;
|
|
|
|
|
return grub_errno;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
}
|
|
|
|
|
filename_alloc = 1;
|
2011-11-10 07:16:27 +00:00
|
|
|
|
grub_strncat (filename, (char *) &entry->data[1], csize);
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
filename[size] = '\0';
|
2004-11-01 16:14:16 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* The mode information (st_mode). */
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
else if (grub_strncmp ((char *) entry->sig, "PX", 2) == 0)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
/* At position 0 of the PX record the st_mode information is
|
2009-05-13 20:09:09 +00:00
|
|
|
|
stored (little-endian). */
|
|
|
|
|
grub_uint32_t mode = ((entry->data[0] + (entry->data[1] << 8))
|
2004-11-01 16:14:16 +00:00
|
|
|
|
& GRUB_ISO9660_FSTYPE_MASK);
|
|
|
|
|
|
|
|
|
|
switch (mode)
|
|
|
|
|
{
|
|
|
|
|
case GRUB_ISO9660_FSTYPE_DIR:
|
|
|
|
|
type = GRUB_FSHELP_DIR;
|
|
|
|
|
break;
|
|
|
|
|
case GRUB_ISO9660_FSTYPE_REG:
|
|
|
|
|
type = GRUB_FSHELP_REG;
|
|
|
|
|
break;
|
|
|
|
|
case GRUB_ISO9660_FSTYPE_SYMLINK:
|
|
|
|
|
type = GRUB_FSHELP_SYMLINK;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
type = GRUB_FSHELP_UNKNOWN;
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-10-25 19:52:48 +00:00
|
|
|
|
else if (grub_strncmp ("SL", (char *) entry->sig, 2) == 0)
|
|
|
|
|
{
|
|
|
|
|
unsigned int pos = 1;
|
|
|
|
|
|
|
|
|
|
/* The symlink is not stored as a POSIX symlink, translate it. */
|
2012-03-31 10:08:50 +00:00
|
|
|
|
while (pos + sizeof (*entry) < entry->len)
|
2011-10-25 19:52:48 +00:00
|
|
|
|
{
|
|
|
|
|
/* The current position is the `Component Flag'. */
|
|
|
|
|
switch (entry->data[pos] & 30)
|
|
|
|
|
{
|
|
|
|
|
case 0:
|
|
|
|
|
{
|
|
|
|
|
/* The data on pos + 2 is the actual data, pos + 1
|
|
|
|
|
is the length. Both are part of the `Component
|
|
|
|
|
Record'. */
|
2012-05-10 21:35:03 +00:00
|
|
|
|
if (symlink && !was_continue)
|
2011-10-30 19:23:05 +00:00
|
|
|
|
add_part ("/", 1);
|
2011-10-25 19:52:48 +00:00
|
|
|
|
add_part ((char *) &entry->data[pos + 2],
|
|
|
|
|
entry->data[pos + 1]);
|
2012-05-10 21:35:03 +00:00
|
|
|
|
was_continue = (entry->data[pos] & 1);
|
2011-10-25 19:52:48 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
|
add_part ("./", 2);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
|
add_part ("../", 3);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 8:
|
|
|
|
|
add_part ("/", 1);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* In pos + 1 the length of the `Component Record' is
|
|
|
|
|
stored. */
|
|
|
|
|
pos += entry->data[pos + 1] + 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check if `grub_realloc' failed. */
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
len = get_node_size (dir);
|
|
|
|
|
|
|
|
|
|
for (; offset < len; offset += dirent.len)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
2011-10-25 19:52:48 +00:00
|
|
|
|
symlink = 0;
|
2012-05-10 21:35:03 +00:00
|
|
|
|
was_continue = 0;
|
2011-10-25 19:52:48 +00:00
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
if (read_node (dir, offset, sizeof (dirent), (char *) &dirent))
|
2004-11-01 16:14:16 +00:00
|
|
|
|
return 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* The end of the block, skip to the next one. */
|
|
|
|
|
if (!dirent.len)
|
|
|
|
|
{
|
|
|
|
|
offset = (offset / GRUB_ISO9660_BLKSZ + 1) * GRUB_ISO9660_BLKSZ;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
char name[dirent.namelen + 1];
|
|
|
|
|
int nameoffset = offset + sizeof (dirent);
|
|
|
|
|
struct grub_fshelp_node *node;
|
|
|
|
|
int sua_off = (sizeof (dirent) + dirent.namelen + 1
|
2009-07-19 13:59:21 +00:00
|
|
|
|
- (dirent.namelen % 2));
|
2004-11-01 16:14:16 +00:00
|
|
|
|
int sua_size = dirent.len - sua_off;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
sua_off += offset + dir->data->susp_skip;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
filename = 0;
|
|
|
|
|
filename_alloc = 0;
|
|
|
|
|
type = GRUB_FSHELP_UNKNOWN;
|
|
|
|
|
|
|
|
|
|
if (dir->data->rockridge
|
2011-10-25 16:18:58 +00:00
|
|
|
|
&& grub_iso9660_susp_iterate (dir, sua_off, sua_size,
|
|
|
|
|
susp_iterate_dir))
|
2004-11-01 16:14:16 +00:00
|
|
|
|
return 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Read the name. */
|
2011-10-25 16:18:58 +00:00
|
|
|
|
if (read_node (dir, nameoffset, dirent.namelen, (char *) name))
|
2004-11-01 16:14:16 +00:00
|
|
|
|
return 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
node = grub_malloc (sizeof (struct grub_fshelp_node));
|
|
|
|
|
if (!node)
|
|
|
|
|
return 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
node->alloc_dirents = ARRAY_SIZE (node->dirents);
|
|
|
|
|
node->have_dirents = 1;
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Setup a new node. */
|
|
|
|
|
node->data = dir->data;
|
2011-11-10 08:31:06 +00:00
|
|
|
|
node->have_symlink = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* If the filetype was not stored using rockridge, use
|
|
|
|
|
whatever is stored in the iso9660 filesystem. */
|
|
|
|
|
if (type == GRUB_FSHELP_UNKNOWN)
|
|
|
|
|
{
|
2011-10-25 16:18:58 +00:00
|
|
|
|
if ((dirent.flags & FLAG_TYPE) == FLAG_TYPE_DIR)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
type = GRUB_FSHELP_DIR;
|
|
|
|
|
else
|
|
|
|
|
type = GRUB_FSHELP_REG;
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2012-05-17 11:47:23 +00:00
|
|
|
|
/* . and .. */
|
2012-05-26 22:58:48 +00:00
|
|
|
|
if (!filename && dirent.namelen == 1 && name[0] == 0)
|
|
|
|
|
filename = (char *) ".";
|
|
|
|
|
|
|
|
|
|
if (!filename && dirent.namelen == 1 && name[0] == 1)
|
|
|
|
|
filename = (char *) "..";
|
2012-05-17 11:47:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* The filename was not stored in a rock ridge entry. Read it
|
|
|
|
|
from the iso9660 filesystem. */
|
2012-05-17 11:47:23 +00:00
|
|
|
|
if (!dir->data->joliet && !filename)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
2012-05-18 10:51:02 +00:00
|
|
|
|
char *ptr;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
name[dirent.namelen] = '\0';
|
|
|
|
|
filename = grub_strrchr (name, ';');
|
|
|
|
|
if (filename)
|
|
|
|
|
*filename = '\0';
|
2012-05-18 10:51:02 +00:00
|
|
|
|
/* ISO9660 names are not case-preserving. */
|
|
|
|
|
type |= GRUB_FSHELP_CASE_INSENSITIVE;
|
|
|
|
|
for (ptr = name; *ptr; ptr++)
|
|
|
|
|
*ptr = grub_tolower (*ptr);
|
|
|
|
|
if (ptr != name && *(ptr - 1) == '.')
|
|
|
|
|
*(ptr - 1) = 0;
|
2012-05-17 11:47:23 +00:00
|
|
|
|
filename = name;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2012-05-17 11:47:23 +00:00
|
|
|
|
if (dir->data->joliet && !filename)
|
2008-02-24 15:34:15 +00:00
|
|
|
|
{
|
2010-02-22 08:18:59 +00:00
|
|
|
|
char *oldname, *semicolon;
|
2008-02-24 15:34:15 +00:00
|
|
|
|
|
2012-05-17 11:47:23 +00:00
|
|
|
|
oldname = name;
|
2008-02-24 15:34:15 +00:00
|
|
|
|
filename = grub_iso9660_convert_string
|
2011-12-13 15:35:12 +00:00
|
|
|
|
((grub_uint8_t *) oldname, dirent.namelen >> 1);
|
2008-02-24 15:34:15 +00:00
|
|
|
|
|
2010-02-22 08:18:59 +00:00
|
|
|
|
semicolon = grub_strrchr (filename, ';');
|
|
|
|
|
if (semicolon)
|
|
|
|
|
*semicolon = '\0';
|
|
|
|
|
|
2008-02-24 15:34:15 +00:00
|
|
|
|
if (filename_alloc)
|
|
|
|
|
grub_free (oldname);
|
|
|
|
|
|
|
|
|
|
filename_alloc = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
node->dirents[0] = dirent;
|
|
|
|
|
while (dirent.flags & FLAG_MORE_EXTENTS)
|
|
|
|
|
{
|
|
|
|
|
offset += dirent.len;
|
|
|
|
|
if (read_node (dir, offset, sizeof (dirent), (char *) &dirent))
|
|
|
|
|
{
|
|
|
|
|
if (filename_alloc)
|
|
|
|
|
grub_free (filename);
|
|
|
|
|
grub_free (node);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
if (node->have_dirents >= node->alloc_dirents)
|
|
|
|
|
{
|
|
|
|
|
struct grub_fshelp_node *new_node;
|
|
|
|
|
node->alloc_dirents *= 2;
|
2011-11-10 08:31:06 +00:00
|
|
|
|
new_node = grub_realloc (node,
|
|
|
|
|
sizeof (struct grub_fshelp_node)
|
|
|
|
|
+ ((node->alloc_dirents
|
|
|
|
|
- ARRAY_SIZE (node->dirents))
|
|
|
|
|
* sizeof (node->dirents[0])));
|
2011-10-25 16:18:58 +00:00
|
|
|
|
if (!new_node)
|
|
|
|
|
{
|
|
|
|
|
if (filename_alloc)
|
|
|
|
|
grub_free (filename);
|
|
|
|
|
grub_free (node);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2011-11-10 08:31:06 +00:00
|
|
|
|
node = new_node;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
}
|
|
|
|
|
node->dirents[node->have_dirents++] = dirent;
|
|
|
|
|
}
|
2011-11-10 08:31:06 +00:00
|
|
|
|
if (symlink)
|
|
|
|
|
{
|
|
|
|
|
if ((node->alloc_dirents - node->have_dirents)
|
|
|
|
|
* sizeof (node->dirents[0]) < grub_strlen (symlink) + 1)
|
|
|
|
|
{
|
|
|
|
|
struct grub_fshelp_node *new_node;
|
|
|
|
|
new_node = grub_realloc (node,
|
|
|
|
|
sizeof (struct grub_fshelp_node)
|
|
|
|
|
+ ((node->alloc_dirents
|
|
|
|
|
- ARRAY_SIZE (node->dirents))
|
|
|
|
|
* sizeof (node->dirents[0]))
|
|
|
|
|
+ grub_strlen (symlink) + 1);
|
|
|
|
|
if (!new_node)
|
|
|
|
|
{
|
|
|
|
|
if (filename_alloc)
|
|
|
|
|
grub_free (filename);
|
|
|
|
|
grub_free (node);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
node = new_node;
|
|
|
|
|
}
|
|
|
|
|
node->have_symlink = 1;
|
|
|
|
|
grub_strcpy (node->symlink
|
|
|
|
|
+ node->have_dirents * sizeof (node->dirents[0])
|
|
|
|
|
- sizeof (node->dirents), symlink);
|
|
|
|
|
grub_free (symlink);
|
2012-05-10 21:35:03 +00:00
|
|
|
|
symlink = 0;
|
|
|
|
|
was_continue = 0;
|
2011-11-10 08:31:06 +00:00
|
|
|
|
}
|
2013-01-21 01:33:46 +00:00
|
|
|
|
if (hook (filename, type, node, hook_data))
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
if (filename_alloc)
|
|
|
|
|
grub_free (filename);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (filename_alloc)
|
|
|
|
|
grub_free (filename);
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-01-21 01:33:46 +00:00
|
|
|
|
/* Context for grub_iso9660_dir. */
|
|
|
|
|
struct grub_iso9660_dir_ctx
|
|
|
|
|
{
|
|
|
|
|
grub_fs_dir_hook_t hook;
|
|
|
|
|
void *hook_data;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Helper for grub_iso9660_dir. */
|
|
|
|
|
static int
|
|
|
|
|
grub_iso9660_dir_iter (const char *filename,
|
|
|
|
|
enum grub_fshelp_filetype filetype,
|
|
|
|
|
grub_fshelp_node_t node, void *data)
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_dir_ctx *ctx = data;
|
|
|
|
|
struct grub_dirhook_info info;
|
|
|
|
|
|
|
|
|
|
grub_memset (&info, 0, sizeof (info));
|
|
|
|
|
info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
|
|
|
|
|
info.mtimeset = !!iso9660_to_unixtime2 (&node->dirents[0].mtime, &info.mtime);
|
|
|
|
|
|
|
|
|
|
grub_free (node);
|
|
|
|
|
return ctx->hook (filename, &info, ctx->hook_data);
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
static grub_err_t
|
2009-06-10 21:04:23 +00:00
|
|
|
|
grub_iso9660_dir (grub_device_t device, const char *path,
|
2013-01-21 01:33:46 +00:00
|
|
|
|
grub_fs_dir_hook_t hook, void *hook_data)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
2013-01-21 01:33:46 +00:00
|
|
|
|
struct grub_iso9660_dir_ctx ctx = { hook, hook_data };
|
2004-11-01 16:14:16 +00:00
|
|
|
|
struct grub_iso9660_data *data = 0;
|
|
|
|
|
struct grub_fshelp_node rootnode;
|
|
|
|
|
struct grub_fshelp_node *foundnode;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
|
|
|
|
|
data = grub_iso9660_mount (device->disk);
|
2006-06-05 17:18:31 +00:00
|
|
|
|
if (! data)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
rootnode.data = data;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
rootnode.alloc_dirents = 0;
|
|
|
|
|
rootnode.have_dirents = 1;
|
2011-11-10 08:31:06 +00:00
|
|
|
|
rootnode.have_symlink = 0;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
rootnode.dirents[0] = data->voldesc.rootdir;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Use the fshelp function to traverse the path. */
|
|
|
|
|
if (grub_fshelp_find_file (path, &rootnode,
|
|
|
|
|
&foundnode,
|
|
|
|
|
grub_iso9660_iterate_dir,
|
|
|
|
|
grub_iso9660_read_symlink,
|
|
|
|
|
GRUB_FSHELP_DIR))
|
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* List the files in the directory. */
|
2013-01-21 01:33:46 +00:00
|
|
|
|
grub_iso9660_iterate_dir (foundnode, grub_iso9660_dir_iter, &ctx);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
if (foundnode != &rootnode)
|
|
|
|
|
grub_free (foundnode);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
fail:
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Open a file named NAME and initialize FILE. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_iso9660_open (struct grub_file *file, const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_data *data;
|
|
|
|
|
struct grub_fshelp_node rootnode;
|
|
|
|
|
struct grub_fshelp_node *foundnode;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
|
|
|
|
|
data = grub_iso9660_mount (file->device->disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
rootnode.data = data;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
rootnode.alloc_dirents = 0;
|
|
|
|
|
rootnode.have_dirents = 1;
|
2011-11-10 08:31:06 +00:00
|
|
|
|
rootnode.have_symlink = 0;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
rootnode.dirents[0] = data->voldesc.rootdir;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* Use the fshelp function to traverse the path. */
|
|
|
|
|
if (grub_fshelp_find_file (name, &rootnode,
|
|
|
|
|
&foundnode,
|
|
|
|
|
grub_iso9660_iterate_dir,
|
|
|
|
|
grub_iso9660_read_symlink,
|
|
|
|
|
GRUB_FSHELP_REG))
|
|
|
|
|
goto fail;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2011-10-25 16:18:58 +00:00
|
|
|
|
data->node = foundnode;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
file->data = data;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
file->size = get_node_size (foundnode);
|
2004-11-01 16:14:16 +00:00
|
|
|
|
file->offset = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
return 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
fail:
|
|
|
|
|
grub_dl_unref (my_mod);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_free (data);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2009-07-19 13:59:21 +00:00
|
|
|
|
return grub_errno;
|
2004-11-01 16:14:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_ssize_t
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
|
grub_iso9660_read (grub_file_t file, char *buf, grub_size_t len)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
2009-06-10 21:04:23 +00:00
|
|
|
|
struct grub_iso9660_data *data =
|
2004-11-01 16:14:16 +00:00
|
|
|
|
(struct grub_iso9660_data *) file->data;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
/* XXX: The file is stored in as a single extent. */
|
2009-06-10 21:04:23 +00:00
|
|
|
|
data->disk->read_hook = file->read_hook;
|
2011-10-25 16:18:58 +00:00
|
|
|
|
read_node (data->node, file->offset, len, buf);
|
2010-01-04 22:47:30 +00:00
|
|
|
|
data->disk->read_hook = NULL;
|
|
|
|
|
|
|
|
|
|
if (grub_errno)
|
|
|
|
|
return -1;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
return len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_iso9660_close (grub_file_t file)
|
|
|
|
|
{
|
2011-10-25 16:18:58 +00:00
|
|
|
|
struct grub_iso9660_data *data =
|
|
|
|
|
(struct grub_iso9660_data *) file->data;
|
|
|
|
|
grub_free (data->node);
|
|
|
|
|
grub_free (data);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_dl_unref (my_mod);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_iso9660_label (grub_device_t device, char **label)
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_data *data;
|
|
|
|
|
data = grub_iso9660_mount (device->disk);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
if (data)
|
|
|
|
|
{
|
2008-02-24 15:34:15 +00:00
|
|
|
|
if (data->joliet)
|
2011-12-13 15:35:12 +00:00
|
|
|
|
*label = grub_iso9660_convert_string (data->voldesc.volname, 16);
|
2008-02-24 15:34:15 +00:00
|
|
|
|
else
|
|
|
|
|
*label = grub_strndup ((char *) data->voldesc.volname, 32);
|
2011-03-26 13:14:59 +00:00
|
|
|
|
if (*label)
|
|
|
|
|
{
|
|
|
|
|
char *ptr;
|
|
|
|
|
for (ptr = *label; *ptr;ptr++);
|
|
|
|
|
ptr--;
|
|
|
|
|
while (ptr >= *label && *ptr == ' ')
|
|
|
|
|
*ptr-- = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
grub_free (data);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
*label = 0;
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
2008-09-06 11:16:52 +00:00
|
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_iso9660_uuid (grub_device_t device, char **uuid)
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_data *data;
|
|
|
|
|
grub_disk_t disk = device->disk;
|
|
|
|
|
|
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
|
|
|
|
|
data = grub_iso9660_mount (disk);
|
|
|
|
|
if (data)
|
|
|
|
|
{
|
2008-09-28 15:22:28 +00:00
|
|
|
|
if (! data->voldesc.modified.year[0] && ! data->voldesc.modified.year[1]
|
|
|
|
|
&& ! data->voldesc.modified.year[2] && ! data->voldesc.modified.year[3]
|
|
|
|
|
&& ! data->voldesc.modified.month[0] && ! data->voldesc.modified.month[1]
|
|
|
|
|
&& ! data->voldesc.modified.day[0] && ! data->voldesc.modified.day[1]
|
|
|
|
|
&& ! data->voldesc.modified.hour[0] && ! data->voldesc.modified.hour[1]
|
|
|
|
|
&& ! data->voldesc.modified.minute[0] && ! data->voldesc.modified.minute[1]
|
|
|
|
|
&& ! data->voldesc.modified.second[0] && ! data->voldesc.modified.second[1]
|
|
|
|
|
&& ! data->voldesc.modified.hundredth[0] && ! data->voldesc.modified.hundredth[1])
|
2008-09-06 11:16:52 +00:00
|
|
|
|
{
|
2009-12-24 22:53:05 +00:00
|
|
|
|
grub_error (GRUB_ERR_BAD_NUMBER, "no creation date in filesystem to generate UUID");
|
2008-09-06 11:16:52 +00:00
|
|
|
|
*uuid = NULL;
|
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
else
|
2008-09-06 11:16:52 +00:00
|
|
|
|
{
|
2010-01-20 08:12:47 +00:00
|
|
|
|
*uuid = grub_xasprintf ("%c%c%c%c-%c%c-%c%c-%c%c-%c%c-%c%c-%c%c",
|
2009-12-29 09:04:06 +00:00
|
|
|
|
data->voldesc.modified.year[0],
|
|
|
|
|
data->voldesc.modified.year[1],
|
|
|
|
|
data->voldesc.modified.year[2],
|
|
|
|
|
data->voldesc.modified.year[3],
|
|
|
|
|
data->voldesc.modified.month[0],
|
|
|
|
|
data->voldesc.modified.month[1],
|
|
|
|
|
data->voldesc.modified.day[0],
|
|
|
|
|
data->voldesc.modified.day[1],
|
|
|
|
|
data->voldesc.modified.hour[0],
|
|
|
|
|
data->voldesc.modified.hour[1],
|
|
|
|
|
data->voldesc.modified.minute[0],
|
|
|
|
|
data->voldesc.modified.minute[1],
|
|
|
|
|
data->voldesc.modified.second[0],
|
|
|
|
|
data->voldesc.modified.second[1],
|
|
|
|
|
data->voldesc.modified.hundredth[0],
|
|
|
|
|
data->voldesc.modified.hundredth[1]);
|
2008-09-06 11:16:52 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
*uuid = NULL;
|
|
|
|
|
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-10 09:32:50 +00:00
|
|
|
|
/* Get writing time of filesystem. */
|
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_iso9660_mtime (grub_device_t device, grub_int32_t *timebuf)
|
|
|
|
|
{
|
|
|
|
|
struct grub_iso9660_data *data;
|
|
|
|
|
grub_disk_t disk = device->disk;
|
|
|
|
|
grub_err_t err;
|
|
|
|
|
|
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
|
|
|
|
|
data = grub_iso9660_mount (disk);
|
|
|
|
|
if (!data)
|
|
|
|
|
{
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
return grub_errno;
|
|
|
|
|
}
|
|
|
|
|
err = iso9660_to_unixtime (&data->voldesc.modified, timebuf);
|
|
|
|
|
|
|
|
|
|
grub_dl_unref (my_mod);
|
|
|
|
|
|
|
|
|
|
grub_free (data);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct grub_fs grub_iso9660_fs =
|
|
|
|
|
{
|
|
|
|
|
.name = "iso9660",
|
|
|
|
|
.dir = grub_iso9660_dir,
|
|
|
|
|
.open = grub_iso9660_open,
|
|
|
|
|
.read = grub_iso9660_read,
|
|
|
|
|
.close = grub_iso9660_close,
|
|
|
|
|
.label = grub_iso9660_label,
|
2008-09-06 11:16:52 +00:00
|
|
|
|
.uuid = grub_iso9660_uuid,
|
2010-12-10 09:32:50 +00:00
|
|
|
|
.mtime = grub_iso9660_mtime,
|
2012-02-27 20:36:58 +00:00
|
|
|
|
#ifdef GRUB_UTIL
|
|
|
|
|
.reserved_first_sector = 1,
|
|
|
|
|
.blocklist_install = 1,
|
|
|
|
|
#endif
|
2004-11-01 16:14:16 +00:00
|
|
|
|
.next = 0
|
|
|
|
|
};
|
|
|
|
|
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
|
GRUB_MOD_INIT(iso9660)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_register (&grub_iso9660_fs);
|
|
|
|
|
my_mod = mod;
|
|
|
|
|
}
|
|
|
|
|
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
|
GRUB_MOD_FINI(iso9660)
|
2004-11-01 16:14:16 +00:00
|
|
|
|
{
|
|
|
|
|
grub_fs_unregister (&grub_iso9660_fs);
|
|
|
|
|
}
|