mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-19 23:22:16 +03:00
emulation on host: add missing strlcat strlcpy (#6327)
This commit is contained in:
parent
82a1382864
commit
a64ef544d9
@ -287,6 +287,7 @@ MOCK_ARDUINO_LIBS := $(addprefix common/,\
|
|||||||
MockEsp.cpp \
|
MockEsp.cpp \
|
||||||
MockEEPROM.cpp \
|
MockEEPROM.cpp \
|
||||||
MockSPI.cpp \
|
MockSPI.cpp \
|
||||||
|
strl.cpp \
|
||||||
)
|
)
|
||||||
|
|
||||||
CPP_SOURCES_CORE_EMU = \
|
CPP_SOURCES_CORE_EMU = \
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#endif
|
#endif
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
@ -49,6 +50,8 @@ char* ltoa (long val, char *s, int radix);
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
size_t strlcat(char *dst, const char *src, size_t size);
|
||||||
|
size_t strlcpy(char *dst, const char *src, size_t size);
|
||||||
|
|
||||||
// exotic typedefs used in the sdk
|
// exotic typedefs used in the sdk
|
||||||
|
|
||||||
|
86
tests/host/common/strl.cpp
Normal file
86
tests/host/common/strl.cpp
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
// https://gist.github.com/Fonger/98cc95ac39fbe1a7e4d9
|
||||||
|
|
||||||
|
#ifndef HAVE_STRLCAT
|
||||||
|
/*
|
||||||
|
'_cups_strlcat()' - Safely concatenate two strings.
|
||||||
|
*/
|
||||||
|
|
||||||
|
size_t /* O - Length of string */
|
||||||
|
strlcat(char *dst, /* O - Destination string */
|
||||||
|
const char *src, /* I - Source string */
|
||||||
|
size_t size) /* I - Size of destination string buffer */
|
||||||
|
{
|
||||||
|
size_t srclen; /* Length of source string */
|
||||||
|
size_t dstlen; /* Length of destination string */
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
Figure out how much room is left...
|
||||||
|
*/
|
||||||
|
|
||||||
|
dstlen = strlen(dst);
|
||||||
|
size -= dstlen + 1;
|
||||||
|
|
||||||
|
if (!size)
|
||||||
|
{
|
||||||
|
return (dstlen); /* No room, return immediately... */
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Figure out how much room is needed...
|
||||||
|
*/
|
||||||
|
|
||||||
|
srclen = strlen(src);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copy the appropriate amount...
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (srclen > size)
|
||||||
|
{
|
||||||
|
srclen = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(dst + dstlen, src, srclen);
|
||||||
|
dst[dstlen + srclen] = '\0';
|
||||||
|
|
||||||
|
return (dstlen + srclen);
|
||||||
|
}
|
||||||
|
#endif /* !HAVE_STRLCAT */
|
||||||
|
|
||||||
|
#ifndef HAVE_STRLCPY
|
||||||
|
/*
|
||||||
|
'_cups_strlcpy()' - Safely copy two strings.
|
||||||
|
*/
|
||||||
|
|
||||||
|
size_t /* O - Length of string */
|
||||||
|
strlcpy(char *dst, /* O - Destination string */
|
||||||
|
const char *src, /* I - Source string */
|
||||||
|
size_t size) /* I - Size of destination string buffer */
|
||||||
|
{
|
||||||
|
size_t srclen; /* Length of source string */
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
Figure out how much room is needed...
|
||||||
|
*/
|
||||||
|
|
||||||
|
size --;
|
||||||
|
|
||||||
|
srclen = strlen(src);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copy the appropriate amount...
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (srclen > size)
|
||||||
|
{
|
||||||
|
srclen = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(dst, src, srclen);
|
||||||
|
dst[srclen] = '\0';
|
||||||
|
|
||||||
|
return (srclen);
|
||||||
|
}
|
||||||
|
#endif /* !HAVE_STRLCPY */
|
Loading…
x
Reference in New Issue
Block a user