From: Serge Petrenko <sergepetrenko@tarantool.org> To: Cyrill Gorcunov <gorcunov@gmail.com>, tml <tarantool-patches@dev.tarantool.org> Cc: Mons Anderson <v.perepelitsa@corp.mail.ru>, Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v4 1/4] util: introduce strlcpy helper Date: Fri, 11 Dec 2020 10:58:21 +0300 [thread overview] Message-ID: <02c6bfc0-ceb1-c1bc-5d8b-2450dbc082bc@tarantool.org> (raw) In-Reply-To: <e5f55fa2-738b-04ac-5476-510893ecbf93@tarantool.org> 11.12.2020 10:34, Serge Petrenko via Tarantool-patches пишет: > > 10.12.2020 19:18, Cyrill Gorcunov пишет: >> Very convenient to have this string extension. >> We will use it in crash handling. >> >> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> >> --- > > Hi! Thanks for the patch! > > LGTM. > >> 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..7b168a177 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) { One nit: we usually use `if(smth)` for boolean values only. For integer values please use the explicit variant: `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..8dcc48ada 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. > -- Serge Petrenko
next prev parent reply other threads:[~2020-12-11 7:58 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-10 16:18 [Tarantool-patches] [PATCH v4 0/4] crash: implement sending feedback Cyrill Gorcunov 2020-12-10 16:18 ` [Tarantool-patches] [PATCH v4 1/4] util: introduce strlcpy helper Cyrill Gorcunov 2020-12-11 7:34 ` Serge Petrenko 2020-12-11 7:58 ` Serge Petrenko [this message] 2020-12-11 10:04 ` Cyrill Gorcunov 2020-12-11 11:07 ` Serge Petrenko 2020-12-11 11:38 ` Cyrill Gorcunov 2020-12-14 22:54 ` Vladislav Shpilevoy 2020-12-14 22:54 ` Vladislav Shpilevoy 2020-12-15 8:47 ` Cyrill Gorcunov 2020-12-10 16:18 ` [Tarantool-patches] [PATCH v4 2/4] backtrace: allow to specify destination buffer Cyrill Gorcunov 2020-12-11 7:50 ` Serge Petrenko 2020-12-10 16:18 ` [Tarantool-patches] [PATCH v4 3/4] crash: move fatal signal handling in Cyrill Gorcunov 2020-12-11 9:31 ` Serge Petrenko 2020-12-11 10:38 ` Cyrill Gorcunov 2020-12-11 11:12 ` Serge Petrenko 2020-12-14 22:54 ` Vladislav Shpilevoy 2020-12-15 8:16 ` Cyrill Gorcunov 2020-12-20 14:48 ` Vladislav Shpilevoy 2020-12-20 15:49 ` Cyrill Gorcunov 2020-12-20 16:07 ` Vladislav Shpilevoy 2020-12-20 16:58 ` Cyrill Gorcunov 2020-12-20 15:45 ` Vladislav Shpilevoy 2020-12-10 16:18 ` [Tarantool-patches] [PATCH v4 4/4] crash: report crash data to the feedback server Cyrill Gorcunov 2020-12-11 12:57 ` Serge Petrenko 2020-12-12 16:19 ` Cyrill Gorcunov 2020-12-12 17:07 ` Cyrill Gorcunov 2020-12-14 9:41 ` Serge Petrenko 2020-12-14 22:54 ` Vladislav Shpilevoy 2020-12-16 11:16 ` Cyrill Gorcunov 2020-12-16 20:31 ` Cyrill Gorcunov 2020-12-20 15:16 ` Vladislav Shpilevoy 2020-12-20 18:26 ` Cyrill Gorcunov 2020-12-20 14:48 ` Vladislav Shpilevoy 2020-12-20 18:21 ` Cyrill Gorcunov 2020-12-20 18:41 ` Vladislav Shpilevoy 2020-12-20 19:16 ` Cyrill Gorcunov 2020-12-21 17:01 ` Vladislav Shpilevoy
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=02c6bfc0-ceb1-c1bc-5d8b-2450dbc082bc@tarantool.org \ --to=sergepetrenko@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.perepelitsa@corp.mail.ru \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v4 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