Skip to content

Commit dc0210b

Browse files
authored
fix(rtthread): implement lv_strcat function in rt-thread due to absence of rt_strcat (lvgl#5920)
Signed-off-by: lhdjply <[email protected]>
1 parent fea8a97 commit dc0210b

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/stdlib/builtin/lv_string_builtin.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,8 @@ char * lv_strdup(const char * src)
229229

230230
char * lv_strcat(char * dst, const char * src)
231231
{
232-
char * tmp = dst;
233-
while(*dst != '\0') {
234-
dst++;
235-
}
236-
lv_strcpy(dst, src);
237-
return tmp;
232+
lv_strcpy(dst + lv_strlen(dst), src);
233+
return dst;
238234
}
239235

240236
char * lv_strncat(char * dst, const char * src, size_t src_len)

src/stdlib/rtthread/lv_string_rtthread.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ char * lv_strdup(const char * src)
8787

8888
char * lv_strcat(char * dst, const char * src)
8989
{
90-
return strcat(dst, src);
90+
/*Since RT-thread does not have rt_strcat,
91+
the following code is used instead.*/
92+
lv_strcpy(dst + lv_strlen(dst), src);
93+
return dst;
9194
}
9295

9396
char * lv_strncat(char * dst, const char * src, size_t src_len)

0 commit comments

Comments
 (0)