From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id EE5432082 for ; Thu, 17 Jan 2019 14:10:52 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jan 2019 05:10:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,489,1539673200"; d="scan'208";a="126801456" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.237.221.22]) ([10.237.221.22]) by orsmga002.jf.intel.com with ESMTP; 17 Jan 2019 05:10:51 -0800 To: Bruce Richardson , dev@dpdk.org References: <20190116124836.40132-1-bruce.richardson@intel.com> From: Ferruh Yigit Openpgp: preference=signencrypt Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= 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 vM8= Message-ID: Date: Thu, 17 Jan 2019 13:10:50 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190116124836.40132-1-bruce.richardson@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH] eal: support strlcat function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2019 13:10:53 -0000 On 1/16/2019 12:48 PM, Bruce Richardson wrote: > Add the strlcat function to DPDK to exist alongside the strlcpy one. While > strncat is generally safe for use for concatenation, the API for the > strlcat function is perhaps a little nicer to use, and supports truncation > detection. > > See commit: 5364de644a4b ("eal: support strlcpy function") for more > details on the function selection logic, since we only should be using the > DPDK-provided version when no system-provided version is present. > > Signed-off-by: Bruce Richardson > --- > .../common/include/rte_string_fns.h | 15 +++++++ > test/test/test_string_fns.c | 45 +++++++++++++++++++ > 2 files changed, 60 insertions(+) > > diff --git a/lib/librte_eal/common/include/rte_string_fns.h b/lib/librte_eal/common/include/rte_string_fns.h > index 9a2a1ff90..e7a1656f0 100644 > --- a/lib/librte_eal/common/include/rte_string_fns.h > +++ b/lib/librte_eal/common/include/rte_string_fns.h > @@ -59,10 +59,24 @@ rte_strlcpy(char *dst, const char *src, size_t size) > return (size_t)snprintf(dst, size, "%s", src); > } > > +/** > + * @internal > + * DPDK-specific version of strlcat for systems without > + * libc or libbsd copies of the function > + */ > +static inline size_t > +rte_strlcat(char *dst, const char *src, size_t size) > +{ > + size_t l = strnlen(dst, size); > + return l + ((l < size) ? > + rte_strlcpy(&dst[l], src, size - l) : strlen(src)); I think operation is complex for ternary operation, regular if check can be simpler, other than that looks good to me. > +} > + > /* pull in a strlcpy function */ > #ifdef RTE_EXEC_ENV_BSDAPP > #ifndef __BSD_VISIBLE /* non-standard functions are hidden */ > #define strlcpy(dst, src, size) rte_strlcpy(dst, src, size) > +#define strlcat(dst, src, size) rte_strlcat(dst, src, size) > #endif > > #else /* non-BSD platforms */ > @@ -71,6 +85,7 @@ rte_strlcpy(char *dst, const char *src, size_t size) > > #else /* no BSD header files, create own */ > #define strlcpy(dst, src, size) rte_strlcpy(dst, src, size) > +#define strlcat(dst, src, size) rte_strlcat(dst, src, size) > > #endif /* RTE_USE_LIBBSD */ > #endif /* BSDAPP */ > diff --git a/test/test/test_string_fns.c b/test/test/test_string_fns.c > index 3f091ab92..3bd8ed5d8 100644 > --- a/test/test/test_string_fns.c > +++ b/test/test/test_string_fns.c > @@ -129,11 +129,56 @@ test_rte_strsplit(void) > return 0; > } > > +int > +test_rte_strlcat(void) > +{ > + /* only run actual unit tests if we have system-provided strlcat */ > +#if defined(__BSD_VISIBLE) || defined(RTE_USE_LIBBSD) > +#define BUF_LEN 32 > + const char dst[BUF_LEN] = "Test string"; > + const char src[] = " appended"; > + char bsd_dst[BUF_LEN]; > + char rte_dst[BUF_LEN]; > + size_t i, bsd_ret, rte_ret; > + > + LOG("dst = '%s', strlen(dst) = %zu\n", dst, strlen(dst)); > + LOG("src = '%s', strlen(src) = %zu\n", src, strlen(src)); > + LOG("---\n"); > + > + for (i = 0; i < BUF_LEN; i++) { > + /* initialize destination buffers */ > + memcpy(bsd_dst, dst, BUF_LEN); > + memcpy(rte_dst, dst, BUF_LEN); > + /* compare implementations */ > + bsd_ret = strlcat(bsd_dst, src, i); > + rte_ret = rte_strlcat(rte_dst, src, i); > + if (bsd_ret != rte_ret) { > + LOG("Incorrect retval for buf length = %zu\n", i); > + LOG("BSD: '%zu', rte: '%zu'\n", bsd_ret, rte_ret); > + return -1; > + } > + if (memcmp(bsd_dst, rte_dst, BUF_LEN) != 0) { > + LOG("Resulting buffers don't match\n"); > + LOG("BSD: '%s', rte: '%s'\n", bsd_dst, rte_dst); > + return -1; > + } > + LOG("buffer size = %zu: dst = '%s', ret = %zu\n", > + i, rte_dst, rte_ret); > + } > + LOG("Checked %zu combinations\n", i); > +#undef BUF_LEN > +#endif /* defined(__BSD_VISIBLE) || defined(RTE_USE_LIBBSD) */ > + > + return 0; > +} > + > static int > test_string_fns(void) > { > if (test_rte_strsplit() < 0) > return -1; > + if (test_rte_strlcat() < 0) > + return -1; > return 0; > } > >