[dpdk-stable] patch 'app/regex: fix usage text' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/12/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/7b581788eec45529377f6f9a645d93bf664cd8a0

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 7b581788eec45529377f6f9a645d93bf664cd8a0 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Mon, 5 Apr 2021 21:33:24 +0200
Subject: [PATCH] app/regex: fix usage text
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit e0512833d4acc6d037fa0ce8d453584618b98019 ]

The usage syntax help includes the program name which was fake.
It is replaced with the real name from argv.

Fixes: de06137cb295 ("app/regex: add RegEx test application")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Ori Kam <orika at nvidia.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 app/test-regex/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-regex/main.c b/app/test-regex/main.c
index ac6152dea7..17ff392b1c 100644
--- a/app/test-regex/main.c
+++ b/app/test-regex/main.c
@@ -105,11 +105,11 @@ args_parse(int argc, char **argv, char *rules_file, char *data_file,
 			*nb_iterations = atoi(optarg);
 			break;
 		case ARG_HELP:
-			usage("RegEx test app");
+			usage(argv[0]);
 			break;
 		default:
 			fprintf(stderr, "Invalid option: %s\n", argv[optind]);
-			usage("RegEx test app");
+			usage(argv[0]);
 			rte_exit(EXIT_FAILURE, "Invalid option\n");
 			break;
 		}
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:30.036958000 +0800
+++ 0134-app-regex-fix-usage-text.patch	2021-05-10 23:59:26.530000000 +0800
@@ -1 +1 @@
-From e0512833d4acc6d037fa0ce8d453584618b98019 Mon Sep 17 00:00:00 2001
+From 7b581788eec45529377f6f9a645d93bf664cd8a0 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit e0512833d4acc6d037fa0ce8d453584618b98019 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -22 +24 @@
-index 18a22db533..8e665df73c 100644
+index ac6152dea7..17ff392b1c 100644
@@ -25,2 +27,2 @@
-@@ -159,10 +159,10 @@ args_parse(int argc, char **argv, char *rules_file, char *data_file,
- 			*nb_segs = atoi(optarg);
+@@ -105,11 +105,11 @@ args_parse(int argc, char **argv, char *rules_file, char *data_file,
+ 			*nb_iterations = atoi(optarg);
@@ -32,0 +35 @@
+ 			fprintf(stderr, "Invalid option: %s\n", argv[optind]);
@@ -35 +38 @@
- 			rte_exit(EXIT_FAILURE, "Invalid option: %s\n", argv[optind]);
+ 			rte_exit(EXIT_FAILURE, "Invalid option\n");