* [PATCH] eal: add getline() function for Windows
@ 2025-05-05 20:40 Andre Muezerie
2025-05-20 17:14 ` Stephen Hemminger
0 siblings, 1 reply; 3+ messages in thread
From: Andre Muezerie @ 2025-05-05 20:40 UTC (permalink / raw)
To: Dmitry Kozlyuk, Tyler Retzlaff, Thomas Monjalon; +Cc: dev, Andre Muezerie
Existing DPDK code uses getline(), which is a POSIX function and is
not available in the Windows APIs.
Instead of rewriting it or coming up with some other replacement, this
patch makes use of the implementation provided by NetBSD to make it
possible to compile code dependent on getline on Windows.
Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
lib/eal/windows/getline.c | 61 +++++++++++++++++++++++++++++++
lib/eal/windows/include/getline.h | 28 ++++++++++++++
lib/eal/windows/meson.build | 1 +
license/exceptions.txt | 2 +
4 files changed, 92 insertions(+)
create mode 100644 lib/eal/windows/getline.c
create mode 100644 lib/eal/windows/include/getline.h
diff --git a/lib/eal/windows/getline.c b/lib/eal/windows/getline.c
new file mode 100644
index 0000000000..955452b50e
--- /dev/null
+++ b/lib/eal/windows/getline.c
@@ -0,0 +1,61 @@
+/* SPDX-License-Identifier: BSD-2-Clause
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ */
+
+#include <malloc.h>
+
+#include "getline.h"
+
+ssize_t
+getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
+{
+ char *ptr, *eptr;
+
+ if (*buf == NULL || *bufsiz == 0) {
+ *bufsiz = BUFSIZ;
+ *buf = malloc(*bufsiz);
+ if (buf == NULL)
+ return -1;
+ }
+
+ for (ptr = *buf, eptr = *buf + *bufsiz;;) {
+ int c = fgetc(fp);
+ if (c == -1) {
+ if (feof(fp)) {
+ ssize_t diff = (ssize_t)(ptr - *buf);
+ if (diff != 0) {
+ *ptr = '\0';
+ return diff;
+ }
+ }
+ return -1;
+ }
+ *ptr++ = c;
+ if (c == delimiter) {
+ *ptr = '\0';
+ return ptr - *buf;
+ }
+ if (ptr + 2 >= eptr) {
+ char *nbuf;
+ size_t nbufsiz = *bufsiz * 2;
+ ssize_t d = ptr - *buf;
+ nbuf = realloc(*buf, nbufsiz);
+ if (nbuf == NULL)
+ return -1;
+ *buf = nbuf;
+ *bufsiz = nbufsiz;
+ eptr = nbuf + nbufsiz;
+ ptr = nbuf + d;
+ }
+ }
+}
+
+ssize_t
+getline(char **buf, size_t *bufsiz, FILE *fp)
+{
+ return getdelim(buf, bufsiz, '\n', fp);
+}
diff --git a/lib/eal/windows/include/getline.h b/lib/eal/windows/include/getline.h
new file mode 100644
index 0000000000..2931ce2a02
--- /dev/null
+++ b/lib/eal/windows/include/getline.h
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: BSD-2-Clause
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ */
+
+/**
+ * @file
+ * getline compat.
+ *
+ * This module provides getline() and getdelim().
+ */
+
+#pragma once
+
+#include <stdio.h>
+
+#ifndef ssize_t
+#define ssize_t ptrdiff_t
+#endif
+
+ssize_t
+getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp);
+
+ssize_t
+getline(char **buf, size_t *bufsiz, FILE *fp);
diff --git a/lib/eal/windows/meson.build b/lib/eal/windows/meson.build
index 7756d417be..c526ede405 100644
--- a/lib/eal/windows/meson.build
+++ b/lib/eal/windows/meson.build
@@ -17,6 +17,7 @@ sources += files(
'eal_mp.c',
'eal_thread.c',
'eal_timer.c',
+ 'getline.c',
'getopt.c',
'rte_thread.c',
)
diff --git a/license/exceptions.txt b/license/exceptions.txt
index d12fac2034..2785a4f335 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -16,4 +16,6 @@ MIT | 10/23/2019 | 02/10/2020 | lib/eal/windows/inc
BSD-2-Clause | 10/23/2019 | 12/18/2019 | lib/eal/windows/include/getopt.h
ISC AND BSD-2-Clause | 10/23/2019 | 12/18/2019 | lib/eal/windows/getopt.c
MIT | 10/19/2022 | 10/18/2022 | drivers/net/gve/base/*
+BSD-2-Clause | XX/XX/XXXX | XX/XX/XXXX | lib/eal/windows/include/getline.h
+BSD-2-Clause | XX/XX/XXXX | XX/XX/XXXX | lib/eal/windows/getline.c
---------------------------------------------------------------------------------------------------
--
2.49.0.vfs.0.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] eal: add getline() function for Windows
2025-05-05 20:40 [PATCH] eal: add getline() function for Windows Andre Muezerie
@ 2025-05-20 17:14 ` Stephen Hemminger
2025-05-21 0:35 ` Andre Muezerie
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Hemminger @ 2025-05-20 17:14 UTC (permalink / raw)
To: Andre Muezerie; +Cc: Dmitry Kozlyuk, Tyler Retzlaff, Thomas Monjalon, dev
On Mon, 5 May 2025 13:40:07 -0700
Andre Muezerie <andremue@linux.microsoft.com> wrote:
> Existing DPDK code uses getline(), which is a POSIX function and is
> not available in the Windows APIs.
>
> Instead of rewriting it or coming up with some other replacement, this
> patch makes use of the implementation provided by NetBSD to make it
> possible to compile code dependent on getline on Windows.
>
> Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
Not sure, are BSD-2 and BSD-3 compatible?
Getting license exception approved requires going through the governing board
which can take up to 6 months.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] eal: add getline() function for Windows
2025-05-20 17:14 ` Stephen Hemminger
@ 2025-05-21 0:35 ` Andre Muezerie
0 siblings, 0 replies; 3+ messages in thread
From: Andre Muezerie @ 2025-05-21 0:35 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Dmitry Kozlyuk, Tyler Retzlaff, Thomas Monjalon, dev
On Tue, May 20, 2025 at 10:14:33AM -0700, Stephen Hemminger wrote:
> On Mon, 5 May 2025 13:40:07 -0700
> Andre Muezerie <andremue@linux.microsoft.com> wrote:
>
> > Existing DPDK code uses getline(), which is a POSIX function and is
> > not available in the Windows APIs.
> >
> > Instead of rewriting it or coming up with some other replacement, this
> > patch makes use of the implementation provided by NetBSD to make it
> > possible to compile code dependent on getline on Windows.
> >
> > Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
>
> Not sure, are BSD-2 and BSD-3 compatible?
> Getting license exception approved requires going through the governing board
> which can take up to 6 months.
Hi Stephen, I would appreciate some guidance here.
My understanding is that in general, BSD-2 licensed code can be used in BSD-3
licensed projects, as long as the BSD-2 license is retained in the original
(BSD-2) files.
I do see that BSD-2 was listed in the exception table (for getopt function). It's
not clear to me why it needed to be listed as an exception, but if that was
needed, it indicates that the same should be done for getline(). Is that not
the case?
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-21 0:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-05-05 20:40 [PATCH] eal: add getline() function for Windows Andre Muezerie
2025-05-20 17:14 ` Stephen Hemminger
2025-05-21 0:35 ` Andre Muezerie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).