From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5199F46762; Fri, 16 May 2025 15:22:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ECE44402ED; Fri, 16 May 2025 15:22:21 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 67EF340292 for ; Fri, 16 May 2025 15:22:20 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1213) id B09372118E45; Fri, 16 May 2025 06:22:19 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B09372118E45 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1747401739; bh=WuwxDODN3PlxSKvZAlwY+krx9Cw+7xdJ+Ep7PSi3ack=; h=From:To:Cc:Subject:Date:From; b=gt99Tu5/eD7QiHjPid4L1+iBLbIfR/uEfCkcoCKSDrHbjZSgaKgSvNqvImAlz9syw ZEBMFjHsB+9l62KbdXB1w4b2rTqnp+WKEOY+aZYvQZBonZed4MRsnGTwleV6hQ7wKh 17TTYtfuDeCWlKH1ejO/6Q9zoAjKk4yyIa517+hY= From: Andre Muezerie To: Dmitry Kozlyuk , Tyler Retzlaff Cc: dev@dpdk.org, Andre Muezerie Subject: [PATCH 1/2] eal: add strsep() for Windows builds Date: Fri, 16 May 2025 06:22:13 -0700 Message-Id: <1747401734-6303-1-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Function strsep() is used by DPDK code but is not available on Windows. This patch adds an implementation from NetBSD, unblocking code depending on it from being compiled on Windows. Signed-off-by: Andre Muezerie --- lib/eal/windows/include/rte_os_shim.h | 1 + lib/eal/windows/include/strsep.h | 9 +++++ lib/eal/windows/meson.build | 1 + lib/eal/windows/strsep.c | 47 +++++++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 lib/eal/windows/include/strsep.h create mode 100644 lib/eal/windows/strsep.c diff --git a/lib/eal/windows/include/rte_os_shim.h b/lib/eal/windows/include/rte_os_shim.h index 0e74eb19c7..9c3da554da 100644 --- a/lib/eal/windows/include/rte_os_shim.h +++ b/lib/eal/windows/include/rte_os_shim.h @@ -7,6 +7,7 @@ #include #include +#include /** * @file diff --git a/lib/eal/windows/include/strsep.h b/lib/eal/windows/include/strsep.h new file mode 100644 index 0000000000..d5d2860d48 --- /dev/null +++ b/lib/eal/windows/include/strsep.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + */ + +#pragma once + +char * +strsep(char **stringp, const char *delim); diff --git a/lib/eal/windows/meson.build b/lib/eal/windows/meson.build index 7756d417be..eadecd473c 100644 --- a/lib/eal/windows/meson.build +++ b/lib/eal/windows/meson.build @@ -19,6 +19,7 @@ sources += files( 'eal_timer.c', 'getopt.c', 'rte_thread.c', + 'strsep.c', ) dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true) diff --git a/lib/eal/windows/strsep.c b/lib/eal/windows/strsep.c new file mode 100644 index 0000000000..fdc0688a07 --- /dev/null +++ b/lib/eal/windows/strsep.c @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + */ + +#include + +#include "strsep.h" + +/* Get next token from string *stringp, where tokens are possibly empty + * strings separated by characters from delim. + * + * Writes NULLs into the string at *stringp to end tokens. + * delim need not remain constant from call to call. + * On return, *stringp points past the last NULL written (if there might + * be further tokens), or is NULL (if there are definitely no more tokens). + * + * If *stringp is NULL, strsep returns NULL. + */ +char * +strsep(char **stringp, const char *delim) +{ + char *s; + const char *spanp; + int c, sc; + char *tok; + + s = *stringp; + if (s == NULL) + return NULL; + for (tok = s;;) { + c = *s++; + spanp = delim; + do { + sc = *spanp++; + if (sc == c) { + if (c == 0) + s = NULL; + else + s[-1] = 0; + *stringp = s; + return tok; + } + } while (sc != 0); + } + /* NOTREACHED */ +} -- 2.49.0.vfs.0.3