From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH v5 1/4] util: introduce strlcpy helper Date: Wed, 23 Dec 2020 18:41:52 +0300 [thread overview] Message-ID: <20201223154155.234884-2-gorcunov@gmail.com> (raw) In-Reply-To: <20201223154155.234884-1-gorcunov@gmail.com> Very convenient to have this string extension. We will use it in crash handling. Acked-by: Serge Petrenko <sergepetrenko@tarantool.org> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- CMakeLists.txt | 1 + src/lib/core/util.c | 14 ++++++++++++++ src/trivia/config.h.cmake | 5 +++++ src/trivia/util.h | 15 +++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa6818f8e..aa23113b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,6 +126,7 @@ set(CMAKE_REQUIRED_LIBRARIES "") check_function_exists(clock_gettime HAVE_CLOCK_GETTIME_WITHOUT_RT) check_symbol_exists(__get_cpuid cpuid.h HAVE_CPUID) +check_symbol_exists(strlcpy string.h HAVE_STRLCPY) # Checks for libev include(CheckStructHasMember) diff --git a/src/lib/core/util.c b/src/lib/core/util.c index dfce317f0..f29886105 100644 --- a/src/lib/core/util.c +++ b/src/lib/core/util.c @@ -250,6 +250,20 @@ int2str(long long int val) return buf; } +#ifndef HAVE_STRLCPY +size_t +strlcpy(char *dst, const char *src, size_t size) +{ + size_t src_len = strlen(src); + if (size != 0) { + size_t len = (src_len >= size) ? size - 1 : src_len; + memcpy(dst, src, len); + dst[len] = '\0'; + } + return src_len; +} +#endif + int utf8_check_printable(const char *start, size_t length) { diff --git a/src/trivia/config.h.cmake b/src/trivia/config.h.cmake index 89e0d39c6..21efb978e 100644 --- a/src/trivia/config.h.cmake +++ b/src/trivia/config.h.cmake @@ -47,6 +47,11 @@ */ #cmakedefine HAVE_CPUID 1 +/** + * Defined if strlcpy() string extension helper present. + */ + #cmakedefine HAVE_STRLCPY 1 + /* * Defined if gcov instrumentation should be enabled. */ diff --git a/src/trivia/util.h b/src/trivia/util.h index da5a3705e..15f9881db 100644 --- a/src/trivia/util.h +++ b/src/trivia/util.h @@ -450,6 +450,21 @@ fpconv_strtod(const char *nptr, char **endptr) return strtod(nptr, endptr); } +#ifndef HAVE_STRLCPY +/** + * Copy string. Unlike @a strncpy the result string + * is always null-terminated. + * + * @param dst destination buffer. + * @param src source string. + * @param size destination buffer size. + * + * @return size of @a src string. + */ +size_t +strlcpy(char *dst, const char *src, size_t size); +#endif + /** * Check that @a str is valid utf-8 sequence and can be printed * unescaped. -- 2.26.2
next prev parent reply other threads:[~2020-12-23 15:42 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-23 15:41 [Tarantool-patches] [PATCH v5 0/4] Our feedback daemon sends only a few portions of usage Cyrill Gorcunov 2020-12-23 15:41 ` Cyrill Gorcunov [this message] 2020-12-23 15:41 ` [Tarantool-patches] [PATCH v5 2/4] backtrace: allow to specify destination buffer Cyrill Gorcunov 2020-12-23 15:41 ` [Tarantool-patches] [PATCH v5 3/4] crash: move fatal signal handling in Cyrill Gorcunov 2020-12-23 15:41 ` [Tarantool-patches] [PATCH v5 4/4] crash: report crash data to the feedback server Cyrill Gorcunov 2020-12-23 18:47 ` Vladislav Shpilevoy 2020-12-23 18:57 ` Cyrill Gorcunov 2020-12-23 21:22 ` Cyrill Gorcunov 2020-12-24 13:16 ` Cyrill Gorcunov 2020-12-24 17:15 ` Vladislav Shpilevoy 2020-12-24 17:33 ` Cyrill Gorcunov 2020-12-24 18:22 ` Vladislav Shpilevoy 2020-12-24 18:33 ` Cyrill Gorcunov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201223154155.234884-2-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v5 1/4] util: introduce strlcpy helper' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox