eal/windows: use bundled getopt with MinGW
PATCH 1/1 eal/windows: use bundled getopt with MinGW
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.
---
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(-)
lib/librte_eal/meson.build +0 -3
@@ -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
lib/librte_eal/windows/getopt.c +4 -5
@@ -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 */
Signature · 1 line
2.25.4
Quoted 28 lines
-----Original Message-----
From: Dmitry Kozlyuk <[email protected]>
Sent: Thursday, September 24, 2020 4:17 PM
To: [email protected]
Cc: Dmitry Kozlyuk <[email protected]>; [email protected]; Khoa To <[email protected]>; Tal Shnaiderman <[email protected]>; Narcisa Ana Maria Vasile <[email protected]>; Dmitry Malloy (MESHCHANINOV) <[email protected]>; Pallavi Kadam <[email protected]>
Subject: [EXTERNAL] [PATCH] eal/windows: use bundled getopt with MinGWClang builds use
getopt.cinlibrte_ealwhile MinGW provides implementation as part of the toolchain. Statically linkinglibrte_ealto an application that depends on getopt results in undefined reference errors with MinGW. There are no such errors with Clang, because with Clanglibrte_ealactually defines getopt functions.Use
getopt.cin EAL with Clang and MinGW to get identical behavior. Adjust code for MinGW. Incidentally, this removes a bug whenfree()is called on uninitialized memory.Fixes 5e373e456e6 ("eal/windows: add getopt implementation")Signed-off-by Dmitry Kozlyuk <[email protected]>Reported-by Khoa To <[email protected]>Reported-by Tal Shnaiderman <[email protected]>
Quoted 9 lines
---
This patch probably supesedes
https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch
work.dpdk.org%2Fpatch%2F78574%2F&data=02%7C01%7Ckhot%40micr osoft.com%7C7f6e47a7db0945b2c93708d860dffaa3%7C72f988bf86f141af91a b2d7cd011db47%7C1%7C0%7C637365862839491238&sdata=%2BQPJ2US hknxQLV97rQRVc0sT55TpTNjNTq1m9oj9eFs%3D&reserved=0.
Thomas Monjalon
AppliedQuoted 18 lines
Quoted 18 lines
Clang builds use
getopt.cinlibrte_ealwhile MinGW provides implementation as part of the toolchain. Statically linkinglibrte_ealto an application that depends on getopt results in undefined reference errors with MinGW. There are no such errors with Clang, because with Clanglibrte_ealactually defines getopt functions.Use
getopt.cin EAL with Clang and MinGW to get identical behavior. Adjust code for MinGW. Incidentally, this removes a bug whenfree()is called on uninitialized memory.Fixes 5e373e456e6 ("eal/windows: add getopt implementation")Signed-off-by Dmitry Kozlyuk <[email protected]>Reported-by Khoa To <[email protected]>Reported-by Tal Shnaiderman <[email protected]>---
Quoted 8 lines
Quoted 6 lines
This patch probably supesedes
https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch
work.dpdk.org%2Fpatch%2F78574%2F&data=02%7C01%7Ckhot%40micr osoft.com%7C7f6e47a7db0945b2c93708d860dffaa3%7C72f988bf86f141af91a b2d7cd011db47%7C1%7C0%7C637365862839491238&sdata=%2BQPJ2US hknxQLV97rQRVc0sT55TpTNjNTq1m9oj9eFs%3D&reserved=0.Acked-by Khoa To <[email protected]>
Applied, thanks
Quoted 10 lines · Dmitry Kozlyuk
Clang builds use
getopt.cinlibrte_ealwhile MinGW provides implementation as part of the toolchain. Statically linkinglibrte_ealto an application that depends on getopt results in undefined reference errors with MinGW. There are no such errors with Clang, because with Clanglibrte_ealactually defines getopt functions.Use
getopt.cin EAL with Clang and MinGW to get identical behavior. Adjust code for MinGW. Incidentally, this removes a bug whenfree()is called on uninitialized memory.
Quoted 6 lines
Fixes 5e373e456e6 ("eal/windows: add getopt implementation")Signed-off-by Dmitry Kozlyuk <[email protected]>Reported-by Khoa To <[email protected]>Reported-by Tal Shnaiderman <[email protected]>