From: ito at mlb.co.jp Date: Tue, 04 Apr 2006 15:54:24 +0900 (JST) Subject: [U-Boot-Users] [PATCH] Fix fsload loads wrong file. Message-ID: <20060404.155424.78706681.ito@mlb.co.jp> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Command 'fsload' loads wrong file. Example # ls / ...... -rw-r--r-- 764267 uImage -rw-r--r-- 764267 uImage2 # fsload uImage2 will load uImage. Please consider to merge. Patch is attched. -------- Hiroshi Ito Media Lab. Inc., URL http://www.mlb.co.jp ( Sorry, Japanese only. ) TEL +81-3-5294-7255 FAX +81-3-5294-7256 -------------- next part -------------- diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c index 48e7f63..ab5b889 100644 --- a/fs/cramfs/cramfs.c +++ b/fs/cramfs/cramfs.c @@ -97,6 +97,7 @@ static unsigned long cramfs_resolve (uns char *filename) { unsigned long inodeoffset = 0, nextoffset; + int fnamelen=filename?strlen(filename):0; while (inodeoffset < size) { struct cramfs_inode *inode; @@ -125,7 +126,8 @@ static unsigned long cramfs_resolve (uns namelen--; } - if (!strncmp (filename, name, namelen)) { + if (namelen == fnamelen && + !strncmp (filename, name, namelen)) { char *p = strtok (NULL, "/"); if (raw && (p == NULL || *p == '\0'))