From f699cec7d56ae0f8350b28ae08083dbb1270abbc Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 11 Jan 2019 15:03:54 +0100
Subject: [PATCH] s3:utils: Use C99 initializer for poptOption in smbget

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---
 source3/utils/smbget.c | 152 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 133 insertions(+), 19 deletions(-)

diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 49cca4efa2a..58690be56e3 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -769,25 +769,139 @@ int main(int argc, char **argv)
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 
-		{"workgroup",  'w', POPT_ARG_STRING, &opt.workgroup,   'w', "Workgroup to use (optional)" },
-		{"user",       'U', POPT_ARG_STRING, &opt.username,    'U', "Username to use" },
-		{"guest",      'a', POPT_ARG_NONE,   NULL,             'a', "Work as user guest" },
-
-		{"nonprompt",  'n', POPT_ARG_NONE,   NULL,             'n',  "Don't ask anything (non-interactive)" },
-		{"debuglevel", 'd', POPT_ARG_INT,    &opt.debuglevel,  'd', "Debuglevel to use" },
-
-		{"encrypt",    'e', POPT_ARG_NONE,   NULL,             'e', "Encrypt SMB transport" },
-		{"resume",     'r', POPT_ARG_NONE,   NULL,             'r',  "Automatically resume aborted files" },
-		{"update",     'u', POPT_ARG_NONE,   NULL,             'u',  "Download only when remote file is newer than local file or local file is missing"},
-		{"recursive",  'R', POPT_ARG_NONE,   NULL,             'R',  "Recursively download files" },
-		{"blocksize",  'b', POPT_ARG_INT,    &opt.blocksize,   'b', "Change number of bytes in a block"},
-
-		{"outputfile", 'o', POPT_ARG_STRING, &opt.outputfile,  'o', "Write downloaded data to specified file" },
-		{"stdout",     'O', POPT_ARG_NONE,   NULL,             'O',  "Write data to stdout" },
-		{"dots",       'D', POPT_ARG_NONE,   NULL,             'D',  "Show dots as progress indication" },
-		{"quiet",      'q', POPT_ARG_NONE,   NULL,             'q',  "Be quiet" },
-		{"verbose",    'v', POPT_ARG_NONE,   NULL,             'v',  "Be verbose" },
-		{"rcfile",     'f', POPT_ARG_STRING, NULL,             'f', "Use specified rc file"},
+		{
+			.longName   = "workgroup",
+			.shortName  = 'w',
+			.argInfo    = POPT_ARG_STRING,
+			.arg        = &opt.workgroup,
+			.val        = 'w',
+			.descrip    = "Workgroup to use (optional)"
+		},
+		{
+			.longName   = "user",
+			.shortName  = 'U',
+			.argInfo    = POPT_ARG_STRING,
+			.arg        = &opt.username,
+			.val        = 'U',
+			.descrip    = "Username to use"
+		},
+		{
+			.longName   = "guest",
+			.shortName  = 'a',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'a',
+			.descrip    = "Work as user guest"
+		},
+
+		{
+			.longName   = "nonprompt",
+			.shortName  = 'n',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'n',
+			.descrip    = "Don't ask anything (non-interactive)"
+		},
+		{
+			.longName   = "debuglevel",
+			.shortName  = 'd',
+			.argInfo    = POPT_ARG_INT,
+			.arg        = &opt.debuglevel,
+			.val        = 'd',
+			.descrip    = "Debuglevel to use"
+		},
+
+		{
+			.longName   = "encrypt",
+			.shortName  = 'e',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'e',
+			.descrip    = "Encrypt SMB transport"
+		},
+		{
+			.longName   = "resume",
+			.shortName  = 'r',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'r',
+			.descrip    = "Automatically resume aborted files"
+		},
+		{
+			.longName   = "update",
+			.shortName  = 'u',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'u',
+			.descrip    = "Download only when remote file is "
+				      "newer than local file or local file "
+				      "is missing"
+		},
+		{
+			.longName   = "recursive",
+			.shortName  = 'R',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'R',
+			.descrip    = "Recursively download files"
+		},
+		{
+			.longName   = "blocksize",
+			.shortName  = 'b',
+			.argInfo    = POPT_ARG_INT,
+			.arg        = &opt.blocksize,
+			.val        = 'b',
+			.descrip    = "Change number of bytes in a block"
+		},
+
+		{
+			.longName   = "outputfile",
+			.shortName  = 'o',
+			.argInfo    = POPT_ARG_STRING,
+			.arg        = &opt.outputfile,
+			.val        = 'o',
+			.descrip    = "Write downloaded data to specified file"
+		},
+		{
+			.longName   = "stdout",
+			.shortName  = 'O',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'O',
+			.descrip    = "Write data to stdout"
+		},
+		{
+			.longName   = "dots",
+			.shortName  = 'D',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'D',
+			.descrip    = "Show dots as progress indication"
+		},
+		{
+			.longName   = "quiet",
+			.shortName  = 'q',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'q',
+			.descrip    = "Be quiet"
+		},
+		{
+			.longName   = "verbose",
+			.shortName  = 'v',
+			.argInfo    = POPT_ARG_NONE,
+			.arg        = NULL,
+			.val        = 'v',
+			.descrip    = "Be verbose"
+		},
+		{
+			.longName   = "rcfile",
+			.shortName  = 'f',
+			.argInfo    = POPT_ARG_STRING,
+			.arg        = NULL,
+			.val        = 'f',
+			.descrip    = "Use specified rc file"
+		},
 
 		POPT_TABLEEND
 	};
-- 
2.11.4.GIT