From: wdenk <wdenk>
Date: Fri, 4 Feb 2005 15:02:06 +0000 (+0000)
Subject: * Patch by Cajus Hahn, 04 Feb 2005:
X-Git-Tag: LABEL_2006_03_12_0025~369
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=20a80418f9201f81b718aeb6c872b83bd8e929c0;p=u-boot

* 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
---

diff --git a/CHANGELOG b/CHANGELOG
index bb20426597..e3f71e23c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,13 @@
 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
   makes 'ld' to overlook binary objects compatibility.
 
diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index f8e04ed828..75afb320ec 100644
--- a/common/cmd_ext2.c
+++ b/common/cmd_ext2.c
@@ -161,7 +161,7 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	char *filename = NULL;
 	char *ep;
-	int dev, part = 0;
+	int dev, part = 1;
 	ulong addr = 0, part_length, filelen;
 	disk_partition_t info;
 	block_dev_desc_t *dev_desc = NULL;
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index d13305bf90..c21d2d6172 100644
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -724,7 +724,7 @@ int ext2fs_find_file
 
 
 	symlinknest = 0;
-	if (!path || path[0] != '/') {
+	if (!path) {
 		return (0);
 	}
 
@@ -769,7 +769,7 @@ int ext2fs_open (char *filename) {
 	int len;
 
 	if (ext2fs_root == NULL) {
-		return (0);
+		return (-1);
 	}
 	ext2fs_file = NULL;
 	status = ext2fs_find_file (filename, &ext2fs_root->diropen, &fdiro,
@@ -788,9 +788,9 @@ int ext2fs_open (char *filename) {
 	ext2fs_file = fdiro;
 	return (len);
 
-      fail:
+fail:
 	ext2fs_free_node (fdiro, &ext2fs_root->diropen);
-	return (0);
+	return (-1);
 }