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

* grub-core/fs/sfs.c (grub_fshelp_node): Fix types. 

(grub_sfs_read_extent): Likewise.
	(grub_sfs_read_block): Likewise.
	(grub_sfs_mount): Likewise.
	(grub_sfs_iterate_dir): Likewise.
	(grub_sfs_read_symlink): Use strncpy instead of strcpy.
	(grub_sfs_read): Remove unnecessarry and wrong temporary variable.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-06 04:42:28 +02:00
parent 1b8463f2c4
commit 75ccaea346
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2012-05-06 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/sfs.c (grub_fshelp_node): Fix types.
(grub_sfs_read_extent): Likewise.
(grub_sfs_read_block): Likewise.
(grub_sfs_mount): Likewise.
(grub_sfs_iterate_dir): Likewise.
(grub_sfs_read_symlink): Use strncpy instead of strcpy.
(grub_sfs_read): Remove unnecessarry and wrong temporary variable.
2012-05-04 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-04 Vladimir Serbinenko <phcoder@gmail.com>
Fix errors on compressed NTFS with 512B clusters. Fix errors on compressed NTFS with 512B clusters.

32
grub-core/fs/sfs.c
View File

@ -120,8 +120,8 @@ struct grub_sfs_btree
struct grub_fshelp_node struct grub_fshelp_node
{ {
struct grub_sfs_data *data; struct grub_sfs_data *data;
int block; grub_uint32_t block;
int size; grub_uint32_t size;
grub_uint32_t mtime; grub_uint32_t mtime;
}; };
@ -147,12 +147,12 @@ static grub_dl_t my_mod;
in NEXTEXT. */ in NEXTEXT. */
static grub_err_t static grub_err_t
grub_sfs_read_extent (struct grub_sfs_data *data, unsigned int block, grub_sfs_read_extent (struct grub_sfs_data *data, unsigned int block,
int *size, int *nextext) grub_uint32_t *size, grub_uint32_t *nextext)
{ {
char *treeblock; char *treeblock;
struct grub_sfs_btree *tree; struct grub_sfs_btree *tree;
int i; int i;
int next; grub_uint32_t next;
treeblock = grub_malloc (data->blocksize); treeblock = grub_malloc (data->blocksize);
if (!block) if (!block)
@ -213,9 +213,9 @@ grub_sfs_read_extent (struct grub_sfs_data *data, unsigned int block,
static grub_disk_addr_t static grub_disk_addr_t
grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
{ {
int blk = node->block; grub_uint32_t blk = node->block;
int size = 0; grub_uint32_t size = 0;
int next = 0; grub_uint32_t next = 0;
while (blk) while (blk)
{ {
@ -230,7 +230,7 @@ grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
if (err) if (err)
return 0; return 0;
if (fileblock < (unsigned int) size) if (fileblock < size)
return fileblock + blk; return fileblock + blk;
fileblock -= size; fileblock -= size;
@ -265,7 +265,7 @@ grub_sfs_mount (grub_disk_t disk)
struct grub_sfs_data *data; struct grub_sfs_data *data;
struct grub_sfs_objc *rootobjc; struct grub_sfs_objc *rootobjc;
char *rootobjc_data = 0; char *rootobjc_data = 0;
unsigned int blk; grub_uint32_t blk;
data = grub_malloc (sizeof (*data)); data = grub_malloc (sizeof (*data));
if (!data) if (!data)
@ -337,7 +337,7 @@ grub_sfs_read_symlink (grub_fshelp_node_t node)
/* This is just a wild guess, but it always worked for me. How the /* This is just a wild guess, but it always worked for me. How the
SLNK block looks like is not documented in the SFS docs. */ SLNK block looks like is not documented in the SFS docs. */
symlink = grub_strdup (&block[24]); symlink = grub_strndup (&block[24], data->blocksize - 24);
grub_free (block); grub_free (block);
if (!symlink) if (!symlink)
return 0; return 0;
@ -357,7 +357,7 @@ grub_sfs_iterate_dir (grub_fshelp_node_t dir,
char *objc_data; char *objc_data;
struct grub_sfs_objc *objc; struct grub_sfs_objc *objc;
unsigned int next = dir->block; unsigned int next = dir->block;
int pos; grub_uint32_t pos;
auto int NESTED_FUNC_ATTR grub_sfs_create_node (const char *name, auto int NESTED_FUNC_ATTR grub_sfs_create_node (const char *name,
int block, int block,
@ -416,9 +416,9 @@ grub_sfs_iterate_dir (grub_fshelp_node_t dir,
struct grub_sfs_obj *obj; struct grub_sfs_obj *obj;
obj = (struct grub_sfs_obj *) ((char *) objc + pos); obj = (struct grub_sfs_obj *) ((char *) objc + pos);
const char *filename = (const char *) obj->filename; const char *filename = (const char *) obj->filename;
int len; grub_size_t len;
enum grub_fshelp_filetype type; enum grub_fshelp_filetype type;
unsigned int block; grub_uint32_t block;
/* The filename and comment dynamically increase the size of /* The filename and comment dynamically increase the size of
the object. */ the object. */
@ -525,10 +525,8 @@ grub_sfs_read (grub_file_t file, char *buf, grub_size_t len)
{ {
struct grub_sfs_data *data = (struct grub_sfs_data *) file->data; struct grub_sfs_data *data = (struct grub_sfs_data *) file->data;
int size = grub_sfs_read_file (&data->diropen, file->read_hook, return grub_sfs_read_file (&data->diropen, file->read_hook,
file->offset, len, buf); file->offset, len, buf);
return size;
} }