From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
To: dev@dpdk.org
Cc: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,
stable@dpdk.org, Khoa To <khot@microsoft.com>,
Tal Shnaiderman <talshn@nvidia.com>,
Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>,
Dmitry Malloy <dmitrym@microsoft.com>,
Pallavi Kadam <pallavi.kadam@intel.com>
Subject: [dpdk-dev] [PATCH] eal/windows: use bundled getopt with MinGW
Date: Fri, 25 Sep 2020 02:17:07 +0300 [thread overview]
Message-ID: <20200924231707.23554-1-dmitry.kozliuk@gmail.com> (raw)
Clang builds use getopt.c in librte_eal while MinGW provides
implementation as part of the toolchain. Statically linking librte_eal
to an application that depends on getopt results in undefined reference
errors with MinGW. There are no such errors with Clang, because with
Clang librte_eal actually defines getopt functions.
Use getopt.c in EAL with Clang and MinGW to get identical behavior.
Adjust code for MinGW. Incidentally, this removes a bug when free() is
called on uninitialized memory.
Fixes: 5e373e456e6 ("eal/windows: add getopt implementation")
Cc: stable@dpdk.org
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Reported-by: Khoa To <khot@microsoft.com>
Reported-by: Tal Shnaiderman <talshn@nvidia.com>
---
This patch probably supesedes http://patchwork.dpdk.org/patch/78574/.
lib/librte_eal/meson.build | 3 ---
lib/librte_eal/windows/getopt.c | 9 ++++-----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 8d492897d..7d6222e78 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -25,6 +25,3 @@ endif
if cc.has_function('getentropy', prefix : '#include <unistd.h>')
cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
endif
-if cc.has_header('getopt.h')
- cflags += ['-DHAVE_GETOPT_H', '-DHAVE_GETOPT', '-DHAVE_GETOPT_LONG']
-endif
diff --git a/lib/librte_eal/windows/getopt.c b/lib/librte_eal/windows/getopt.c
index a08f7c109..a1f51c6c2 100644
--- a/lib/librte_eal/windows/getopt.c
+++ b/lib/librte_eal/windows/getopt.c
@@ -242,7 +242,6 @@ getopt_internal(int nargc, char **nargv, const char *options,
char *oli; /* option letter list index */
int optchar, short_too;
static int posixly_correct = -1;
- char *buf;
size_t len;
int optreset = 0;
@@ -253,16 +252,16 @@ getopt_internal(int nargc, char **nargv, const char *options,
* Disable GNU extensions if POSIXLY_CORRECT is set or options
* string begins with a '+'.
*/
- if (posixly_correct == -1)
- posixly_correct = _dupenv_s(&buf, &len, "POSIXLY_CORRECT");
+ if (posixly_correct == -1) {
+ errno_t err = _wgetenv_s(&len, NULL, 0, L"POSIXLY_CORRECT");
+ posixly_correct = (err == 0) && (len > 0);
+ }
if (!posixly_correct || *options == '+')
flags &= ~FLAG_PERMUTE;
else if (*options == '-')
flags |= FLAG_ALLARGS;
if (*options == '+' || *options == '-')
options++;
- if (!posixly_correct)
- free(buf);
/*
* reset if requested
*/
--
2.25.4
next reply other threads:[~2020-09-24 23:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 23:17 Dmitry Kozlyuk [this message]
2020-09-26 1:23 ` [dpdk-dev] [EXTERNAL] " Khoa To
2020-10-05 7:23 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2020-09-28 19:53 ` [dpdk-dev] " Kadam, Pallavi
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=20200924231707.23554-1-dmitry.kozliuk@gmail.com \
--to=dmitry.kozliuk@gmail.com \
--cc=dev@dpdk.org \
--cc=dmitrym@microsoft.com \
--cc=khot@microsoft.com \
--cc=navasile@linux.microsoft.com \
--cc=pallavi.kadam@intel.com \
--cc=stable@dpdk.org \
--cc=talshn@nvidia.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).