andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15382 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

This commit is contained in:
Giovanni Di Sirio 2022-01-21 10:32:49 +00:00
parent 3ee7d28428
commit d15d7c9b2d
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
os/sb/apps/msh/source/paths.c
View File

@ -61,7 +61,7 @@
* @param[out] dst The destination buffer. * @param[out] dst The destination buffer.
* @param[in] src The source path. * @param[in] src The source path.
* @param[in[ size Destination buffer size. * @param[in[ size Destination buffer size.
* @return The combined path size. * @return The size of the combined path.
* @retval 0 Path error or buffer overflow. * @retval 0 Path error or buffer overflow.
*/ */
size_t path_append(char *dst, const char *src, size_t size) { size_t path_append(char *dst, const char *src, size_t size) {
@ -111,26 +111,40 @@ size_t path_append(char *dst, const char *src, size_t size) {
* @param[in] dst The destination path. * @param[in] dst The destination path.
* @param[in] src The path to be prepended. * @param[in] src The path to be prepended.
* @param[in[ size Destination buffer size. * @param[in[ size Destination buffer size.
* @return The operation status. * @return The size of the combined path.
* @retval 0 Path error or buffer overflow. * @retval 0 Path error or buffer overflow.
*/ */
size_t path_prepend(char *dst, const char *src, size_t size) { size_t path_prepend(char *dst, const char *src, size_t size) {
size_t dn, sn; size_t dn, sn;
char *buf = dst;
dn = strnlen(dst, size - 1U); dn = strnlen(dst, size - 1U);
sn = strnlen(src, size - 1U); sn = strnlen(src, size - 1U);
/* The source path needs to end with a separator in case the destination
does not have it. Note, the separator is not written here.*/
if ((sn == 0U) || src[sn - 1U] != '/') {
sn++;
}
/* If the destination has a separator then skipping it.*/
if ((dn > 0U) && (dst[0] == '/')) {
dn--;
dst++;
}
if (dn + sn >= size) { if (dn + sn >= size) {
return (size_t)0; return (size_t)0;
} }
/* Making space for the prefix, including the final zero in the move.*/ /* Making space for the prefix, including the final zero in the move.*/
memmove(dst + sn, dst, dn + 1U); memmove(buf + sn, buf, dn + 1U);
/* Placing the prefix omitting the final zero.*/ /* Placing the prefix omitting the final zero then enforcing the separator.*/
memmove(dst, src, sn); memmove(buf, src, sn);
buf[sn - 1U] = '/';
return sn; return dn + sn;
} }
/** /**
@ -138,7 +152,7 @@ size_t path_prepend(char *dst, const char *src, size_t size) {
* *
* @param[in] dst The destination path. * @param[in] dst The destination path.
* @param[in[ size Destination buffer size. * @param[in[ size Destination buffer size.
* @return The operation status. * @return The size of the combined path.
* @retval 0 Path error or buffer overflow. * @retval 0 Path error or buffer overflow.
*/ */
size_t path_add_separator(char *dst, size_t size) { size_t path_add_separator(char *dst, size_t size) {
@ -151,17 +165,17 @@ size_t path_add_separator(char *dst, size_t size) {
dst[1] = '\0'; dst[1] = '\0';
} }
else { else {
if (dst[dn - 1] != '/') { if (dst[dn - 1U] != '/') {
if (dn >= size - 1) { if (dn >= size - 1U) {
return (size_t)0; return (size_t)0;
} }
dst[dn] = '/'; dst[dn] = '/';
dst[dn + 1] = '\0'; dst[dn + 1U] = '\0';
} }
} }
return dn + 1; return dn;
} }
#if 0 #if 0