From cb3b5397b34eb6ad181b2c9d32996152f28d3974 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Thu, 23 Nov 2023 08:10:46 -0500 Subject: Revert "Extend path_append_ex to truncate compname, remove some strmemdupa" This reverts commit dbe20d453d5e93bd0f1188a8851c6cf4fd230b26. Reason for revert: Crashes ipod Classic Change-Id: I9ea329ce73383535353832d17c7c5e494e5ad516 --- firmware/common/file.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'firmware/common/file.c') diff --git a/firmware/common/file.c b/firmware/common/file.c index 2012e2ff80..202410db81 100644 --- a/firmware/common/file.c +++ b/firmware/common/file.c @@ -1056,7 +1056,7 @@ int rename(const char *old, const char *new) FILE_ERROR(EINVAL, -4); } - //const char * const oldname = strmemdupa(oldinfo.name, oldinfo.length); + const char * const oldname = strmemdupa(oldinfo.name, oldinfo.length); const char * const newname = strmemdupa(newinfo.name, newinfo.length); bool is_overwrite = false; @@ -1076,8 +1076,7 @@ int rename(const char *old, const char *new) FILE_ERROR(ERRNO, rc * 10 - 5); } } - else if (!strncmp(newname, oldinfo.name, oldinfo.length) && /* case-only is ok */ - newname[oldinfo.length] == '\0') /* make sure of actual match */ + else if (!strcmp(newname, oldname)) /* case-only is ok */ { DEBUGF("No name change (success)\n"); rc = 0; -- cgit v1.2.3