From 5be0515dee24308fd7e270bf2e0fb5e5a7a78f32 Mon Sep 17 00:00:00 2001

From: Julien Cristau <jcristau@debian.org>

Date: Thu, 9 Jun 2016 14:30:37 +0200

Subject: [PATCH 02/25] Fix command line parsing

The gettext translation domain should be passed as .arg, not .descrip,

otherwise popt won't process any of the command line options (it stops

looping over the struct poptOption array when an entry has unset

longName, shortName and arg).

Signed-off-by: Julien Cristau <jcristau@debian.org>

---

 src/client.c     | 2 +-

 src/efikeygen.c  | 2 +-

 src/efisiglist.c | 2 +-

 src/pesigcheck.c | 2 +-

 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client.c b/src/client.c

index 028419f..575c873 100644

--- a/src/client.c

+++ b/src/client.c

@@ -555,7 +555,7 @@ main(int argc, char *argv[])

 	struct poptOption options[] = {

 		{.argInfo = POPT_ARG_INTL_DOMAIN,

-		 .descrip = "pesign" },

+		 .arg = "pesign" },

 		{.longName = "token",

 		 .shortName = 't',

 		 .argInfo = POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT,

diff --git a/src/efikeygen.c b/src/efikeygen.c

index 6278849..8a515a5 100644

--- a/src/efikeygen.c

+++ b/src/efikeygen.c

@@ -486,7 +486,7 @@ int main(int argc, char *argv[])

 	poptContext optCon;

 	struct poptOption options[] = {

 		{.argInfo = POPT_ARG_INTL_DOMAIN,

-		 .descrip = "pesign" },

+		 .arg = "pesign" },

 		/* global nss-ish things */

 		{.longName = "dbdir",

 		 .shortName = 'd',

diff --git a/src/efisiglist.c b/src/efisiglist.c

index cd3f1ae..40d6a93 100644

--- a/src/efisiglist.c

+++ b/src/efisiglist.c

@@ -126,7 +126,7 @@ main(int argc, char *argv[])

 	struct poptOption options[] = {

 		{.argInfo = POPT_ARG_INTL_DOMAIN,

-		 .descrip = "pesign" },

+		 .arg = "pesign" },

 		{.longName = "infile",

 		 .shortName = 'i',

 		 .argInfo = POPT_ARG_STRING,

diff --git a/src/pesigcheck.c b/src/pesigcheck.c

index 1328fe9..0d49c1a 100644

--- a/src/pesigcheck.c

+++ b/src/pesigcheck.c

@@ -214,7 +214,7 @@ main(int argc, char *argv[])

 	poptContext optCon;

 	struct poptOption options[] = {

 		{.argInfo = POPT_ARG_INTL_DOMAIN,

-		 .descrip = "pesign" },

+		 .arg = "pesign" },

 		{.longName = "dbfile",

 		 .shortName = 'D',

 		 .argInfo = POPT_ARG_CALLBACK|POPT_CBFLAG_POST,

-- 

2.13.4