Skip to content

emulation on host: add missing strlcat strlcpy #6327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/host/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ MOCK_ARDUINO_LIBS := $(addprefix common/,\
MockEsp.cpp \
MockEEPROM.cpp \
MockSPI.cpp \
strl.cpp \
)

CPP_SOURCES_CORE_EMU = \
Expand Down
3 changes: 3 additions & 0 deletions tests/host/common/mock.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#ifdef __cplusplus
#include <vector>
#endif
#include <stddef.h>


#ifdef __cplusplus
Expand All @@ -49,6 +50,8 @@ char* ltoa (long val, char *s, int radix);
}
#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

Expand Down
86 changes: 86 additions & 0 deletions tests/host/common/strl.cpp
Original file line number Diff line number Diff line change
@@ -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 */