提交 20a80418 编写于 作者: W wdenk

* Patch by Cajus Hahn, 04 Feb 2005:

  - don't insist on leading '/' for filename in ext2load
  - set default partition to useful value (1) in ext2load

* Patch by Andrew Dyer, 08 Jan 2005:
  fix wrong return codes in ext2 code
上级 1a344f29
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
Changes for U-Boot 1.1.3: Changes for U-Boot 1.1.3:
====================================================================== ======================================================================
* Patch by Cajus Hahn, 04 Feb 2005:
- don't insist on leading '/' for filename in ext2load
- set default partition to useful value (1) in ext2load
* Patch by Andrew Dyer, 08 Jan 2005:
fix wrong return codes in ext2 code
* Removed '--no-warn-mismatch' option from Makefile. This option * Removed '--no-warn-mismatch' option from Makefile. This option
makes 'ld' to overlook binary objects compatibility. makes 'ld' to overlook binary objects compatibility.
......
...@@ -161,7 +161,7 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ...@@ -161,7 +161,7 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
char *filename = NULL; char *filename = NULL;
char *ep; char *ep;
int dev, part = 0; int dev, part = 1;
ulong addr = 0, part_length, filelen; ulong addr = 0, part_length, filelen;
disk_partition_t info; disk_partition_t info;
block_dev_desc_t *dev_desc = NULL; block_dev_desc_t *dev_desc = NULL;
......
...@@ -724,7 +724,7 @@ int ext2fs_find_file ...@@ -724,7 +724,7 @@ int ext2fs_find_file
symlinknest = 0; symlinknest = 0;
if (!path || path[0] != '/') { if (!path) {
return (0); return (0);
} }
...@@ -769,7 +769,7 @@ int ext2fs_open (char *filename) { ...@@ -769,7 +769,7 @@ int ext2fs_open (char *filename) {
int len; int len;
if (ext2fs_root == NULL) { if (ext2fs_root == NULL) {
return (0); return (-1);
} }
ext2fs_file = NULL; ext2fs_file = NULL;
status = ext2fs_find_file (filename, &ext2fs_root->diropen, &fdiro, status = ext2fs_find_file (filename, &ext2fs_root->diropen, &fdiro,
...@@ -788,9 +788,9 @@ int ext2fs_open (char *filename) { ...@@ -788,9 +788,9 @@ int ext2fs_open (char *filename) {
ext2fs_file = fdiro; ext2fs_file = fdiro;
return (len); return (len);
fail: fail:
ext2fs_free_node (fdiro, &ext2fs_root->diropen); ext2fs_free_node (fdiro, &ext2fs_root->diropen);
return (0); return (-1);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册