vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2004-04-04 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
All symbols prefixed with PUPA_ and pupa_ are renamed to GRUB_
	and grub_, respectively. Because the conversion is trivial and
	mechanical, I omit the details here. Please refer to the CVS
	if you need more information.
This commit is contained in:
okuji 2004-04-04 13:46:03 +00:00
parent 6a1425510d
commit 4b13b216f4
125 changed files with 6198 additions and 6181 deletions
Download patch file Download diff file Expand all files Collapse all files

500
fs/fat.c
View file

@ -1,6 +1,6 @@
/* fat.c - FAT filesystem */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2000,2001,2002,2003,2004 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
@ -18,115 +18,115 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <pupa/fs.h>
#include <pupa/disk.h>
#include <pupa/file.h>
#include <pupa/types.h>
#include <pupa/misc.h>
#include <pupa/mm.h>
#include <pupa/err.h>
#include <pupa/dl.h>
#include <grub/fs.h>
#include <grub/disk.h>
#include <grub/file.h>
#include <grub/types.h>
#include <grub/misc.h>
#include <grub/mm.h>
#include <grub/err.h>
#include <grub/dl.h>
#define PUPA_FAT_DIR_ENTRY_SIZE 32
#define GRUB_FAT_DIR_ENTRY_SIZE 32
#define PUPA_FAT_ATTR_READ_ONLY 0x01
#define PUPA_FAT_ATTR_HIDDEN 0x02
#define PUPA_FAT_ATTR_SYSTEM 0x04
#define PUPA_FAT_ATTR_VOLUME_ID 0x08
#define PUPA_FAT_ATTR_DIRECTORY 0x10
#define PUPA_FAT_ATTR_ARCHIVE 0x20
#define GRUB_FAT_ATTR_READ_ONLY 0x01
#define GRUB_FAT_ATTR_HIDDEN 0x02
#define GRUB_FAT_ATTR_SYSTEM 0x04
#define GRUB_FAT_ATTR_VOLUME_ID 0x08
#define GRUB_FAT_ATTR_DIRECTORY 0x10
#define GRUB_FAT_ATTR_ARCHIVE 0x20
#define PUPA_FAT_ATTR_LONG_NAME (PUPA_FAT_ATTR_READ_ONLY \
| PUPA_FAT_ATTR_HIDDEN \
| PUPA_FAT_ATTR_SYSTEM \
| PUPA_FAT_ATTR_VOLUME_ID)
#define PUPA_FAT_ATTR_VALID (PUPA_FAT_ATTR_READ_ONLY \
| PUPA_FAT_ATTR_HIDDEN \
| PUPA_FAT_ATTR_SYSTEM \
| PUPA_FAT_ATTR_DIRECTORY \
| PUPA_FAT_ATTR_ARCHIVE)
#define GRUB_FAT_ATTR_LONG_NAME (GRUB_FAT_ATTR_READ_ONLY \
| GRUB_FAT_ATTR_HIDDEN \
| GRUB_FAT_ATTR_SYSTEM \
| GRUB_FAT_ATTR_VOLUME_ID)
#define GRUB_FAT_ATTR_VALID (GRUB_FAT_ATTR_READ_ONLY \
| GRUB_FAT_ATTR_HIDDEN \
| GRUB_FAT_ATTR_SYSTEM \
| GRUB_FAT_ATTR_DIRECTORY \
| GRUB_FAT_ATTR_ARCHIVE)
struct pupa_fat_bpb
struct grub_fat_bpb
{
pupa_uint8_t jmp_boot[3];
pupa_uint8_t oem_name[8];
pupa_uint16_t bytes_per_sector;
pupa_uint8_t sectors_per_cluster;
pupa_uint16_t num_reserved_sectors;
pupa_uint8_t num_fats;
pupa_uint16_t num_root_entries;
pupa_uint16_t num_total_sectors_16;
pupa_uint8_t media;
pupa_uint16_t sectors_per_fat_16;
pupa_uint16_t sectors_per_track;
pupa_uint16_t num_heads;
pupa_uint32_t num_hidden_sectors;
pupa_uint32_t num_total_sectors_32;
grub_uint8_t jmp_boot[3];
grub_uint8_t oem_name[8];
grub_uint16_t bytes_per_sector;
grub_uint8_t sectors_per_cluster;
grub_uint16_t num_reserved_sectors;
grub_uint8_t num_fats;
grub_uint16_t num_root_entries;
grub_uint16_t num_total_sectors_16;
grub_uint8_t media;
grub_uint16_t sectors_per_fat_16;
grub_uint16_t sectors_per_track;
grub_uint16_t num_heads;
grub_uint32_t num_hidden_sectors;
grub_uint32_t num_total_sectors_32;
/* The following fields are only used by FAT32. */
pupa_uint32_t sectors_per_fat_32;
pupa_uint16_t extended_flags;
pupa_uint16_t fs_version;
pupa_uint32_t root_cluster;
pupa_uint16_t fs_info;
pupa_uint16_t backup_boot_sector;
grub_uint32_t sectors_per_fat_32;
grub_uint16_t extended_flags;
grub_uint16_t fs_version;
grub_uint32_t root_cluster;
grub_uint16_t fs_info;
grub_uint16_t backup_boot_sector;
} __attribute__ ((packed));
struct pupa_fat_dir_entry
struct grub_fat_dir_entry
{
pupa_uint8_t name[11];
pupa_uint8_t attr;
pupa_uint8_t nt_reserved;
pupa_uint8_t c_time_tenth;
pupa_uint16_t c_time;
pupa_uint16_t c_date;
pupa_uint16_t a_date;
pupa_uint16_t first_cluster_high;
pupa_uint16_t w_time;
pupa_uint16_t w_date;
pupa_uint16_t first_cluster_low;
pupa_uint32_t file_size;
grub_uint8_t name[11];
grub_uint8_t attr;
grub_uint8_t nt_reserved;
grub_uint8_t c_time_tenth;
grub_uint16_t c_time;
grub_uint16_t c_date;
grub_uint16_t a_date;
grub_uint16_t first_cluster_high;
grub_uint16_t w_time;
grub_uint16_t w_date;
grub_uint16_t first_cluster_low;
grub_uint32_t file_size;
} __attribute__ ((packed));
struct pupa_fat_long_name_entry
struct grub_fat_long_name_entry
{
pupa_uint8_t id;
pupa_uint16_t name1[5];
pupa_uint8_t attr;
pupa_uint8_t reserved;
pupa_uint8_t checksum;
pupa_uint16_t name2[6];
pupa_uint16_t first_cluster;
pupa_uint16_t name3[2];
grub_uint8_t id;
grub_uint16_t name1[5];
grub_uint8_t attr;
grub_uint8_t reserved;
grub_uint8_t checksum;
grub_uint16_t name2[6];
grub_uint16_t first_cluster;
grub_uint16_t name3[2];
} __attribute__ ((packed));
struct pupa_fat_data
struct grub_fat_data
{
int logical_sector_bits;
pupa_uint32_t num_sectors;
grub_uint32_t num_sectors;
pupa_uint16_t fat_sector;
pupa_uint32_t sectors_per_fat;
grub_uint16_t fat_sector;
grub_uint32_t sectors_per_fat;
int fat_size;
pupa_uint32_t root_cluster;
pupa_uint32_t root_sector;
pupa_uint32_t num_root_sectors;
grub_uint32_t root_cluster;
grub_uint32_t root_sector;
grub_uint32_t num_root_sectors;
int cluster_bits;
pupa_uint32_t cluster_eof_mark;
pupa_uint32_t cluster_sector;
pupa_uint32_t num_clusters;
grub_uint32_t cluster_eof_mark;
grub_uint32_t cluster_sector;
grub_uint32_t num_clusters;
pupa_uint8_t attr;
pupa_ssize_t file_size;
pupa_uint32_t file_cluster;
pupa_uint32_t cur_cluster_num;
pupa_uint32_t cur_cluster;
grub_uint8_t attr;
grub_ssize_t file_size;
grub_uint32_t file_cluster;
grub_uint32_t cur_cluster_num;
grub_uint32_t cur_cluster;
};
#ifndef PUPA_UTIL
static pupa_dl_t my_mod;
#ifndef GRUB_UTIL
static grub_dl_t my_mod;
#endif
static int
@ -146,30 +146,30 @@ fat_log2 (unsigned x)
return i;
}
static struct pupa_fat_data *
pupa_fat_mount (pupa_disk_t disk)
static struct grub_fat_data *
grub_fat_mount (grub_disk_t disk)
{
struct pupa_fat_bpb bpb;
struct pupa_fat_data *data = 0;
pupa_uint32_t first_fat, magic;
struct grub_fat_bpb bpb;
struct grub_fat_data *data = 0;
grub_uint32_t first_fat, magic;
if (! disk)
goto fail;
data = (struct pupa_fat_data *) pupa_malloc (sizeof (*data));
data = (struct grub_fat_data *) grub_malloc (sizeof (*data));
if (! data)
goto fail;
/* Read the BPB. */
if (pupa_disk_read (disk, 0, 0, sizeof (bpb), (char *) &bpb))
if (grub_disk_read (disk, 0, 0, sizeof (bpb), (char *) &bpb))
goto fail;
/* Get the sizes of logical sectors and clusters. */
data->logical_sector_bits =
fat_log2 (pupa_le_to_cpu16 (bpb.bytes_per_sector));
if (data->logical_sector_bits < PUPA_DISK_SECTOR_BITS)
fat_log2 (grub_le_to_cpu16 (bpb.bytes_per_sector));
if (data->logical_sector_bits < GRUB_DISK_SECTOR_BITS)
goto fail;
data->logical_sector_bits -= PUPA_DISK_SECTOR_BITS;
data->logical_sector_bits -= GRUB_DISK_SECTOR_BITS;
data->cluster_bits = fat_log2 (bpb.sectors_per_cluster);
if (data->cluster_bits < 0)
@ -177,22 +177,22 @@ pupa_fat_mount (pupa_disk_t disk)
data->cluster_bits += data->logical_sector_bits;
/* Get information about FATs. */
data->fat_sector = (pupa_le_to_cpu16 (bpb.num_reserved_sectors)
data->fat_sector = (grub_le_to_cpu16 (bpb.num_reserved_sectors)
<< data->logical_sector_bits);
if (data->fat_sector == 0)
goto fail;
data->sectors_per_fat = ((bpb.sectors_per_fat_16
? pupa_le_to_cpu16 (bpb.sectors_per_fat_16)
: pupa_le_to_cpu32 (bpb.sectors_per_fat_32))
? grub_le_to_cpu16 (bpb.sectors_per_fat_16)
: grub_le_to_cpu32 (bpb.sectors_per_fat_32))
<< data->logical_sector_bits);
if (data->sectors_per_fat == 0)
goto fail;
/* Get the number of sectors in this volume. */
data->num_sectors = ((bpb.num_total_sectors_16
? pupa_le_to_cpu16 (bpb.num_total_sectors_16)
: pupa_le_to_cpu32 (bpb.num_total_sectors_32))
? grub_le_to_cpu16 (bpb.num_total_sectors_16)
: grub_le_to_cpu32 (bpb.num_total_sectors_32))
<< data->logical_sector_bits);
if (data->num_sectors == 0)
goto fail;
@ -203,10 +203,10 @@ pupa_fat_mount (pupa_disk_t disk)
data->root_sector = data->fat_sector + bpb.num_fats * data->sectors_per_fat;
data->num_root_sectors
= ((((pupa_uint32_t) pupa_le_to_cpu16 (bpb.num_root_entries)
* PUPA_FAT_DIR_ENTRY_SIZE
+ pupa_le_to_cpu16 (bpb.bytes_per_sector) - 1)
>> (data->logical_sector_bits + PUPA_DISK_SECTOR_BITS))
= ((((grub_uint32_t) grub_le_to_cpu16 (bpb.num_root_entries)
* GRUB_FAT_DIR_ENTRY_SIZE
+ grub_le_to_cpu16 (bpb.bytes_per_sector) - 1)
>> (data->logical_sector_bits + GRUB_DISK_SECTOR_BITS))
<< (data->logical_sector_bits));
data->cluster_sector = data->root_sector + data->num_root_sectors;
@ -220,9 +220,9 @@ pupa_fat_mount (pupa_disk_t disk)
if (! bpb.sectors_per_fat_16)
{
/* FAT32. */
pupa_uint16_t flags = pupa_le_to_cpu16 (bpb.extended_flags);
grub_uint16_t flags = grub_le_to_cpu16 (bpb.extended_flags);
data->root_cluster = pupa_le_to_cpu32 (bpb.root_cluster);
data->root_cluster = grub_le_to_cpu32 (bpb.root_cluster);
data->fat_size = 32;
data->cluster_eof_mark = 0x0ffffff8;
@ -263,14 +263,14 @@ pupa_fat_mount (pupa_disk_t disk)
if (data->num_sectors <= data->fat_sector)
goto fail;
if (pupa_disk_read (disk,
if (grub_disk_read (disk,
data->fat_sector,
0,
sizeof (first_fat),
(char *) &first_fat))
goto fail;
first_fat = pupa_le_to_cpu32 (first_fat);
first_fat = grub_le_to_cpu32 (first_fat);
if (data->fat_size == 32)
{
@ -294,26 +294,26 @@ pupa_fat_mount (pupa_disk_t disk)
/* Start from the root directory. */
data->file_cluster = data->root_cluster;
data->cur_cluster_num = ~0UL;
data->attr = PUPA_FAT_ATTR_DIRECTORY;
data->attr = GRUB_FAT_ATTR_DIRECTORY;
return data;
fail:
pupa_free (data);
pupa_error (PUPA_ERR_BAD_FS, "not a fat filesystem");
grub_free (data);
grub_error (GRUB_ERR_BAD_FS, "not a fat filesystem");
return 0;
}
/* Convert UTF-16 (little endian) to UTF8. */
static pupa_uint8_t *
pupa_fat_utf16_to_utf8 (pupa_uint8_t *dest, pupa_uint16_t *src,
pupa_size_t size)
static grub_uint8_t *
grub_fat_utf16_to_utf8 (grub_uint8_t *dest, grub_uint16_t *src,
grub_size_t size)
{
pupa_uint32_t code_high = 0;
grub_uint32_t code_high = 0;
while (size--)
{
pupa_uint32_t code = pupa_le_to_cpu16 (*src++);
grub_uint32_t code = grub_le_to_cpu16 (*src++);
if (code_high)
{
@ -366,27 +366,27 @@ pupa_fat_utf16_to_utf8 (pupa_uint8_t *dest, pupa_uint16_t *src,
return dest;
}
static pupa_ssize_t
pupa_fat_read_data (pupa_disk_t disk, struct pupa_fat_data *data,
static grub_ssize_t
grub_fat_read_data (grub_disk_t disk, struct grub_fat_data *data,
void (*read_hook) (unsigned long sector,
unsigned offset, unsigned length),
pupa_ssize_t offset, pupa_ssize_t len, char *buf)
grub_ssize_t offset, grub_ssize_t len, char *buf)
{
pupa_ssize_t size;
pupa_uint32_t logical_cluster;
grub_ssize_t size;
grub_uint32_t logical_cluster;
unsigned logical_cluster_bits;
pupa_ssize_t ret = 0;
grub_ssize_t ret = 0;
unsigned long sector;
/* This is a special case. FAT12 and FAT16 doesn't have the root directory
in clusters. */
if (data->file_cluster == ~0UL)
{
size = (data->num_root_sectors << PUPA_DISK_SECTOR_BITS) - offset;
size = (data->num_root_sectors << GRUB_DISK_SECTOR_BITS) - offset;
if (size > len)
size = len;
if (pupa_disk_read (disk, data->root_sector, offset, size, buf))
if (grub_disk_read (disk, data->root_sector, offset, size, buf))
return -1;
return size;
@ -395,7 +395,7 @@ pupa_fat_read_data (pupa_disk_t disk, struct pupa_fat_data *data,
/* Calculate the logical cluster number and offset. */
logical_cluster_bits = (data->cluster_bits
+ data->logical_sector_bits
+ PUPA_DISK_SECTOR_BITS);
+ GRUB_DISK_SECTOR_BITS);
logical_cluster = offset >> logical_cluster_bits;
offset &= (1 << logical_cluster_bits) - 1;
@ -410,7 +410,7 @@ pupa_fat_read_data (pupa_disk_t disk, struct pupa_fat_data *data,
while (logical_cluster > data->cur_cluster_num)
{
/* Find next cluster. */
pupa_uint32_t next_cluster;
grub_uint32_t next_cluster;
unsigned long fat_offset;
switch (data->fat_size)
@ -428,12 +428,12 @@ pupa_fat_read_data (pupa_disk_t disk, struct pupa_fat_data *data,
}
/* Read the FAT. */
if (pupa_disk_read (disk, data->fat_sector, fat_offset,
if (grub_disk_read (disk, data->fat_sector, fat_offset,
(data->fat_size + 7) >> 3,
(char *) &next_cluster))
return -1;
next_cluster = pupa_le_to_cpu32 (next_cluster);
next_cluster = grub_le_to_cpu32 (next_cluster);
switch (data->fat_size)
{
case 16:
@ -448,7 +448,7 @@ pupa_fat_read_data (pupa_disk_t disk, struct pupa_fat_data *data,
}
#if 0
pupa_printf ("%s:%d: fat_size=%d, next_cluster=%u\n",
grub_printf ("%s:%d: fat_size=%d, next_cluster=%u\n",
__FILE__, __LINE__, data->fat_size, next_cluster);
#endif
@ -458,7 +458,7 @@ pupa_fat_read_data (pupa_disk_t disk, struct pupa_fat_data *data,
if (next_cluster < 2 || next_cluster >= data->num_clusters)
{
pupa_error (PUPA_ERR_BAD_FS, "invalid cluster %u",
grub_error (GRUB_ERR_BAD_FS, "invalid cluster %u",
next_cluster);
return -1;
}
@ -476,9 +476,9 @@ pupa_fat_read_data (pupa_disk_t disk, struct pupa_fat_data *data,
size = len;
disk->read_hook = read_hook;
pupa_disk_read (disk, sector, offset, size, buf);
grub_disk_read (disk, sector, offset, size, buf);
disk->read_hook = 0;
if (pupa_errno)
if (grub_errno)
return -1;
len -= size;
@ -495,22 +495,22 @@ pupa_fat_read_data (pupa_disk_t disk, struct pupa_fat_data *data,
next path. If there is no next path or an error occurs, return NULL.
If HOOK is specified, call it with each file name. */
static char *
pupa_fat_find_dir (pupa_disk_t disk, struct pupa_fat_data *data,
grub_fat_find_dir (grub_disk_t disk, struct grub_fat_data *data,
const char *path,
int (*hook) (const char *filename, int dir))
{
struct pupa_fat_dir_entry dir;
struct grub_fat_dir_entry dir;
char *dirname, *dirp;
char *filename, *filep = 0;
pupa_uint16_t *unibuf;
grub_uint16_t *unibuf;
int slot = -1, slots = -1;
int checksum = -1;
pupa_ssize_t offset = -sizeof(dir);
grub_ssize_t offset = -sizeof(dir);
int call_hook;
if (! (data->attr & PUPA_FAT_ATTR_DIRECTORY))
if (! (data->attr & GRUB_FAT_ATTR_DIRECTORY))
{
pupa_error (PUPA_ERR_BAD_FILE_TYPE, "not a directory");
grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
return 0;
}
@ -518,32 +518,32 @@ pupa_fat_find_dir (pupa_disk_t disk, struct pupa_fat_data *data,
while (*path == '/')
path++;
dirp = pupa_strchr (path, '/');
dirp = grub_strchr (path, '/');
if (dirp)
{
unsigned len = dirp - path;
dirname = pupa_malloc (len + 1);
dirname = grub_malloc (len + 1);
if (! dirname)
return 0;
pupa_memcpy (dirname, path, len);
grub_memcpy (dirname, path, len);
dirname[len] = '\0';
}
else
/* This is actually a file. */
dirname = pupa_strdup (path);
dirname = grub_strdup (path);
call_hook = (! dirp && hook);
/* Allocate space enough to hold a long name. */
filename = pupa_malloc (0x40 * 13 * 4 + 1);
unibuf = (pupa_uint16_t *) pupa_malloc (0x40 * 13 * 2);
filename = grub_malloc (0x40 * 13 * 4 + 1);
unibuf = (grub_uint16_t *) grub_malloc (0x40 * 13 * 2);
if (! filename || ! unibuf)
{
pupa_free (filename);
pupa_free (unibuf);
pupa_free (dirname);
grub_free (filename);
grub_free (unibuf);
grub_free (dirname);
return 0;
}
@ -555,23 +555,23 @@ pupa_fat_find_dir (pupa_disk_t disk, struct pupa_fat_data *data,
offset += sizeof (dir);
/* Read a directory entry. */
if ((pupa_fat_read_data (disk, data, 0,
if ((grub_fat_read_data (disk, data, 0,
offset, sizeof (dir), (char *) &dir)
!= sizeof (dir))
|| dir.name[0] == 0)
{
if (pupa_errno == PUPA_ERR_NONE && ! call_hook)
pupa_error (PUPA_ERR_FILE_NOT_FOUND, "file not found");
if (grub_errno == GRUB_ERR_NONE && ! call_hook)
grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
break;
}
/* Handle long name entries. */
if (dir.attr == PUPA_FAT_ATTR_LONG_NAME)
if (dir.attr == GRUB_FAT_ATTR_LONG_NAME)
{
struct pupa_fat_long_name_entry *long_name
= (struct pupa_fat_long_name_entry *) &dir;
pupa_uint8_t id = long_name->id;
struct grub_fat_long_name_entry *long_name
= (struct grub_fat_long_name_entry *) &dir;
grub_uint8_t id = long_name->id;
if (id & 0x40)
{
@ -587,14 +587,14 @@ pupa_fat_find_dir (pupa_disk_t disk, struct pupa_fat_data *data,
}
slot--;
pupa_memcpy (unibuf + slot * 13, long_name->name1, 5 * 2);
pupa_memcpy (unibuf + slot * 13 + 5, long_name->name2, 6 * 2);
pupa_memcpy (unibuf + slot * 13 + 11, long_name->name3, 2 * 2);
grub_memcpy (unibuf + slot * 13, long_name->name1, 5 * 2);
grub_memcpy (unibuf + slot * 13 + 5, long_name->name2, 6 * 2);
grub_memcpy (unibuf + slot * 13 + 11, long_name->name3, 2 * 2);
continue;
}
/* Check if this entry is valid. */
if (dir.name[0] == 0xe5 || (dir.attr & ~PUPA_FAT_ATTR_VALID))
if (dir.name[0] == 0xe5 || (dir.attr & ~GRUB_FAT_ATTR_VALID))
continue;
/* This is a workaround for Japanese. */
@ -603,28 +603,28 @@ pupa_fat_find_dir (pupa_disk_t disk, struct pupa_fat_data *data,
if (checksum != -1 && slot == 0)
{
pupa_uint8_t sum;
grub_uint8_t sum;
for (sum = 0, i = 0; i < sizeof (dir.name); i++)
sum = ((sum >> 1) | (sum << 7)) + dir.name[i];
if (sum == checksum)
{
*pupa_fat_utf16_to_utf8 (filename, unibuf, slots * 13) = '\0';
*grub_fat_utf16_to_utf8 (filename, unibuf, slots * 13) = '\0';
if (*dirname == '\0' && call_hook)
{
if (hook (filename, dir.attr & PUPA_FAT_ATTR_DIRECTORY))
if (hook (filename, dir.attr & GRUB_FAT_ATTR_DIRECTORY))
break;
checksum = -1;
continue;
}
if (pupa_strcmp (dirname, filename) == 0)
if (grub_strcmp (dirname, filename) == 0)
{
if (call_hook)
hook (filename, dir.attr & PUPA_FAT_ATTR_DIRECTORY);
hook (filename, dir.attr & GRUB_FAT_ATTR_DIRECTORY);
break;
}
@ -636,13 +636,13 @@ pupa_fat_find_dir (pupa_disk_t disk, struct pupa_fat_data *data,
/* Convert the 8.3 file name. */
filep = filename;
for (i = 0; i < 8 && dir.name[i] && ! pupa_isspace (dir.name[i]); i++)
*filep++ = pupa_tolower (dir.name[i]);
for (i = 0; i < 8 && dir.name[i] && ! grub_isspace (dir.name[i]); i++)
*filep++ = grub_tolower (dir.name[i]);
*filep = '.';
for (i = 8; i < 11 && dir.name[i] && ! pupa_isspace (dir.name[i]); i++)
*++filep = pupa_tolower (dir.name[i]);
for (i = 8; i < 11 && dir.name[i] && ! grub_isspace (dir.name[i]); i++)
*++filep = grub_tolower (dir.name[i]);
if (*filep != '.')
filep++;
@ -651,174 +651,174 @@ pupa_fat_find_dir (pupa_disk_t disk, struct pupa_fat_data *data,
if (*dirname == '\0' && call_hook)
{
if (hook (filename, dir.attr & PUPA_FAT_ATTR_DIRECTORY))
if (hook (filename, dir.attr & GRUB_FAT_ATTR_DIRECTORY))
break;
}
else if (pupa_strcmp (dirname, filename) == 0)
else if (grub_strcmp (dirname, filename) == 0)
{
if (call_hook)
hook (filename, dir.attr & PUPA_FAT_ATTR_DIRECTORY);
hook (filename, dir.attr & GRUB_FAT_ATTR_DIRECTORY);
break;
}
}
pupa_free (filename);
pupa_free (dirname);
grub_free (filename);
grub_free (dirname);
data->attr = dir.attr;
data->file_size = pupa_le_to_cpu32 (dir.file_size);
data->file_cluster = ((pupa_le_to_cpu16 (dir.first_cluster_high) << 16)
| pupa_le_to_cpu16 (dir.first_cluster_low));
data->file_size = grub_le_to_cpu32 (dir.file_size);
data->file_cluster = ((grub_le_to_cpu16 (dir.first_cluster_high) << 16)
| grub_le_to_cpu16 (dir.first_cluster_low));
data->cur_cluster_num = ~0UL;
return dirp;
}
static pupa_err_t
pupa_fat_dir (pupa_device_t device, const char *path,
static grub_err_t
grub_fat_dir (grub_device_t device, const char *path,
int (*hook) (const char *filename, int dir))
{
struct pupa_fat_data *data = 0;
pupa_disk_t disk = device->disk;
struct grub_fat_data *data = 0;
grub_disk_t disk = device->disk;
char *p = (char *) path;
#ifndef PUPA_UTIL
pupa_dl_ref (my_mod);
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = pupa_fat_mount (disk);
data = grub_fat_mount (disk);
if (! data)
goto fail;
do
{
p = pupa_fat_find_dir (disk, data, p, hook);
p = grub_fat_find_dir (disk, data, p, hook);
}
while (p && pupa_errno == PUPA_ERR_NONE);
while (p && grub_errno == GRUB_ERR_NONE);
fail:
pupa_free (data);
grub_free (data);
#ifndef PUPA_UTIL
pupa_dl_unref (my_mod);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return pupa_errno;
return grub_errno;
}
static pupa_err_t
pupa_fat_open (pupa_file_t file, const char *name)
static grub_err_t
grub_fat_open (grub_file_t file, const char *name)
{
struct pupa_fat_data *data = 0;
struct grub_fat_data *data = 0;
char *p = (char *) name;
#ifndef PUPA_UTIL
pupa_dl_ref (my_mod);
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = pupa_fat_mount (file->device->disk);
data = grub_fat_mount (file->device->disk);
if (! data)
goto fail;
do
{
p = pupa_fat_find_dir (file->device->disk, data, p, 0);
if (pupa_errno != PUPA_ERR_NONE)
p = grub_fat_find_dir (file->device->disk, data, p, 0);
if (grub_errno != GRUB_ERR_NONE)
goto fail;
}
while (p);
if (data->attr & PUPA_FAT_ATTR_DIRECTORY)
if (data->attr & GRUB_FAT_ATTR_DIRECTORY)
{
pupa_error (PUPA_ERR_BAD_FILE_TYPE, "not a file");
grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a file");
goto fail;
}
file->data = data;
file->size = data->file_size;
return PUPA_ERR_NONE;
return GRUB_ERR_NONE;
fail:
pupa_free (data);
grub_free (data);
#ifndef PUPA_UTIL
pupa_dl_unref (my_mod);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return pupa_errno;
return grub_errno;
}
static pupa_ssize_t
pupa_fat_read (pupa_file_t file, char *buf, pupa_ssize_t len)
static grub_ssize_t
grub_fat_read (grub_file_t file, char *buf, grub_ssize_t len)
{
return pupa_fat_read_data (file->device->disk, file->data, file->read_hook,
return grub_fat_read_data (file->device->disk, file->data, file->read_hook,
file->offset, len, buf);
}
static pupa_err_t
pupa_fat_close (pupa_file_t file)
static grub_err_t
grub_fat_close (grub_file_t file)
{
pupa_free (file->data);
grub_free (file->data);
#ifndef PUPA_UTIL
pupa_dl_unref (my_mod);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return pupa_errno;
return grub_errno;
}
static pupa_err_t
pupa_fat_label (pupa_device_t device, char **label)
static grub_err_t
grub_fat_label (grub_device_t device, char **label)
{
struct pupa_fat_data *data;
pupa_disk_t disk = device->disk;
pupa_ssize_t offset = -sizeof(struct pupa_fat_dir_entry);
struct grub_fat_data *data;
grub_disk_t disk = device->disk;
grub_ssize_t offset = -sizeof(struct grub_fat_dir_entry);
#ifndef PUPA_UTIL
pupa_dl_ref (my_mod);
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = pupa_fat_mount (disk);
data = grub_fat_mount (disk);
if (! data)
goto fail;
if (! (data->attr & PUPA_FAT_ATTR_DIRECTORY))
if (! (data->attr & GRUB_FAT_ATTR_DIRECTORY))
{
pupa_error (PUPA_ERR_BAD_FILE_TYPE, "not a directory");
grub_error (GRUB_ERR_BAD_FILE_TYPE, "not a directory");
return 0;
}
while (1)
{
struct pupa_fat_dir_entry dir;
struct grub_fat_dir_entry dir;
/* Adjust the offset. */
offset += sizeof (dir);
/* Read a directory entry. */
if ((pupa_fat_read_data (disk, data, 0,
if ((grub_fat_read_data (disk, data, 0,
offset, sizeof (dir), (char *) &dir)
!= sizeof (dir))
|| dir.name[0] == 0)
{
if (pupa_errno != PUPA_ERR_NONE)
if (grub_errno != GRUB_ERR_NONE)
goto fail;
else
{
*label = 0;
return PUPA_ERR_NONE;
return GRUB_ERR_NONE;
}
}
if (dir.attr == PUPA_FAT_ATTR_VOLUME_ID)
if (dir.attr == GRUB_FAT_ATTR_VOLUME_ID)
{
*label = pupa_strndup (dir.name, 11);
return PUPA_ERR_NONE;
*label = grub_strndup (dir.name, 11);
return GRUB_ERR_NONE;
}
}
@ -826,47 +826,47 @@ pupa_fat_label (pupa_device_t device, char **label)
fail:
#ifndef PUPA_UTIL
pupa_dl_unref (my_mod);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
pupa_free (data);
grub_free (data);
return pupa_errno;
return grub_errno;
}
static struct pupa_fs pupa_fat_fs =
static struct grub_fs grub_fat_fs =
{
.name = "fat",
.dir = pupa_fat_dir,
.open = pupa_fat_open,
.read = pupa_fat_read,
.close = pupa_fat_close,
.label = pupa_fat_label,
.dir = grub_fat_dir,
.open = grub_fat_open,
.read = grub_fat_read,
.close = grub_fat_close,
.label = grub_fat_label,
.next = 0
};
#ifdef PUPA_UTIL
#ifdef GRUB_UTIL
void
pupa_fat_init (void)
grub_fat_init (void)
{
pupa_fs_register (&pupa_fat_fs);
grub_fs_register (&grub_fat_fs);
}
void
pupa_fat_fini (void)
grub_fat_fini (void)
{
pupa_fs_unregister (&pupa_fat_fs);
grub_fs_unregister (&grub_fat_fs);
}
#else /* ! PUPA_UTIL */
PUPA_MOD_INIT
#else /* ! GRUB_UTIL */
GRUB_MOD_INIT
{
pupa_fs_register (&pupa_fat_fs);
grub_fs_register (&grub_fat_fs);
my_mod = mod;
}
PUPA_MOD_FINI
GRUB_MOD_FINI
{
pupa_fs_unregister (&pupa_fat_fs);
grub_fs_unregister (&grub_fat_fs);
}
#endif /* ! PUPA_UTIL */
#endif /* ! GRUB_UTIL */