[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-172-g8d533
|
From: |
Mats Erik Andersson |
|
Subject: |
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-172-g8d5332f |
|
Date: |
Sat, 15 Sep 2012 00:03:14 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".
The branch, master has been updated
via 8d5332fe7a1d95efbc1f647d5859d6723a58520e (commit)
from 2425fa8d7d7b0e58e8913fe02fa985d344c5ee70 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8d5332fe7a1d95efbc1f647d5859d6723a58520e
commit 8d5332fe7a1d95efbc1f647d5859d6723a58520e
Author: Mats Erik Andersson <address@hidden>
Date: Sat Sep 15 01:21:01 2012 +0200
Missing values in initialization.
diff --git a/ChangeLog b/ChangeLog
index 78978e4..fe16473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2012-09-15 Mats Erik Andersson <address@hidden>
+
+ Add missing values in option lists, and in similar
+ lists. All were detected as compiler warnings.
+
+ * ftp/cmds.c (types): Add missing values.
+ * ftp/cmdtab.c (cmdtab): Likewise.
+ * ftp/main.c (argp, argp_options): Likewise.
+
+ * src/dnsdomainname.c (argp): Likewise.
+ * src/hostname.c (argp, argp_options): Likewise.
+ * src/logger.c (arpg): Likewise
+ (argp_options): Likewise. New macro GRP.
+
+ Collect Kerberos options into a group where relevant.
+
+ * src/rcp.c (options): Add missing values.
+ * src/rexec.c (argp): Likewise
+ (options): Likewise. New macro GRP.
+ * src/rexecd.c (options): Likewise
+ * src/rlogin.c (argp, argp_options): Likewise.
+ * src/rlogind.c (argp): Likewise.
+ (options): Likewise. New macro GRP.
+ * src/rsh.c (argp, options): Likewise
+ * src/rshd.c (argp, options): Likewise
+
+ * telnet/commands.c (Togglelist, Setlist, ModeList)
+ (SlcList, EnvList, AuthList, EncryptList, cmdtab)
+ (cmdtab2): Add missing values.
+ * telnet/main.c (argp, argp_options): Likewise.
+ * telnet/network.c (timeout): Likewise.
+ * telnet/sys_bsd.c (TimeValue): Likewise.
+
+ * whois/whois.c (gwhois_argp, gwhois_argp_children)
+ (ripe_argp): Add missing values.
+ (gwhois_arpg_options, ripe_argp_options): Likewise.
+ New macro GRP.
+
2012-09-14 Mats Erik Andersson <address@hidden>
libinetutils: Compiler warnings.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index c163e37..62fed74 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -330,7 +330,7 @@ struct types
{"image", "I", TYPE_I, 0},
{"ebcdic", "E", TYPE_E, 0},
{"tenex", "L", TYPE_L, bytename},
- {NULL}
+ {NULL, NULL, 0, NULL}
};
/*
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index 743921d..0905ea7 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -207,7 +207,7 @@ static struct cmd cmdtab[] = {
{"umask", umaskhelp, 0, 1, 1, do_umask},
{"verbose", verbosehelp, 0, 0, 0, setverbose},
{"?", helphelp, 0, 0, 1, help},
- {0},
+ {NULL, NULL, 0, 0, 0, NULL},
};
#define NCMDS (sizeof (cmdtab) / sizeof (cmdtab[0]) - 1)
diff --git a/ftp/main.c b/ftp/main.c
index 2b6e92a..5af6187 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -108,7 +108,7 @@ static struct argp_option argp_options[] = {
{"ipv4", '4', NULL, 0, "contact IPv4 hosts", GRP+1},
{"ipv6", '6', NULL, 0, "contact IPv6 hosts", GRP+1},
#undef GRP
- {NULL}
+ {NULL, 0, NULL, 0, NULL, 0}
};
static error_t
@@ -168,7 +168,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
int
diff --git a/src/dnsdomainname.c b/src/dnsdomainname.c
index 554eef3..6b8912e 100644
--- a/src/dnsdomainname.c
+++ b/src/dnsdomainname.c
@@ -40,7 +40,7 @@ const char *program_authors[] = {
NULL
};
-static struct argp argp = { NULL, NULL, NULL, doc };
+static struct argp argp = { NULL, NULL, NULL, doc, NULL, NULL, NULL };
void
dnsdomainname (void)
diff --git a/src/hostname.c b/src/hostname.c
index 5202b42..ed89d7f 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -69,7 +69,7 @@ static struct argp_option argp_options[] = {
{"yp", 'y', NULL, 0, "NIS/YP domain name", GRP+1},
{"nis", 0, NULL, OPTION_ALIAS, NULL, GRP+1},
#undef GRP
- {NULL}
+ {NULL, 0, NULL, 0, NULL, 0}
};
static error_t
@@ -129,7 +129,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
static void get_name (const hostname_arguments *const args);
static void set_name (const hostname_arguments *const args);
diff --git a/src/logger.c b/src/logger.c
index 7271f4b..9f60f1c 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -383,23 +383,25 @@ const char args_doc[] = "[MESSAGE]";
const char doc[] = "Send messages to syslog";
static struct argp_option argp_options[] = {
- {"ipv4", '4', NULL, 0, "use IPv4 for logging to host" },
- {"ipv6", '6', NULL, 0, "use IPv6 with a host target" },
+#define GRP 10
+ {"ipv4", '4', NULL, 0, "use IPv4 for logging to host", GRP },
+ {"ipv6", '6', NULL, 0, "use IPv6 with a host target", GRP },
{ "host", 'h', "HOST", 0,
- "log to HOST instead of to the default " PATH_LOG },
+ "log to HOST instead of to the default " PATH_LOG, GRP },
{ "unix", 'u', "SOCK", 0,
- "log to UNIX socket SOCK instead of " PATH_LOG },
+ "log to UNIX socket SOCK instead of " PATH_LOG, GRP },
{ "source", 'S', "IP", 0,
- "set source IP address" },
+ "set source IP address", GRP },
{ "id", 'i', "PID", OPTION_ARG_OPTIONAL,
- "log the process id with every line" },
+ "log the process id with every line", GRP },
#ifdef LOG_PERROR
- { "stderr", 's', NULL, 0, "copy the message to stderr" },
+ { "stderr", 's', NULL, 0, "copy the message to stderr", GRP },
#endif
- { "file", 'f', "FILE", 0, "log the content of FILE" },
- { "priority", 'p', "PRI", 0, "log with priority PRI" },
- { "tag", 't', "TAG", 0, "prepend every line with TAG" },
- {NULL}
+ { "file", 'f', "FILE", 0, "log the content of FILE", GRP },
+ { "priority", 'p', "PRI", 0, "log with priority PRI", GRP },
+ { "tag", 't', "TAG", 0, "prepend every line with TAG", GRP },
+#undef GRP
+ {NULL, 0, NULL, 0, NULL, 0 }
};
static error_t
@@ -476,7 +478,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
const char *program_authors[] = {
"Sergey Poznyakoff",
diff --git a/src/rcp.c b/src/rcp.c
index 823638b..08d57fa 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -161,19 +161,6 @@ static struct argp_option options[] = {
"attempt to preserve (duplicate) in its copies the"
" modification times and modes of the source files",
GRID+1 },
-#if defined KERBEROS || defined SHISHI
- { "kerberos", 'K', NULL, 0,
- "turns off all Kerberos authentication",
- GRID+1 },
- { "realm", 'k', "REALM", 0,
- "obtain tickets for a remote host in REALM instead of the remote host's
realm",
- GRID+1 },
-#endif
-#ifdef ENCRYPTION
- { "encrypt", 'x', NULL, 0,
- "encrypt all data transfer",
- GRID+1 },
-#endif
{ "target-directory", 'd', "DIRECTORY", 0,
"copy all SOURCE arguments into DIRECTORY",
GRID+1 },
@@ -191,7 +178,23 @@ static struct argp_option options[] = {
"use only IPv6",
GRID+1 },
#endif /* WITH_ORCMD_AF || WITH_RCMD_AF || SHISHI */
- { NULL }
+#undef GRID
+#if defined KERBEROS || defined SHISHI
+# define GRID 10
+ { "kerberos", 'K', NULL, 0,
+ "turns off all Kerberos authentication",
+ GRID+1 },
+ { "realm", 'k', "REALM", 0,
+ "obtain tickets for a remote host in REALM instead of the remote host's
realm",
+ GRID+1 },
+# ifdef ENCRYPTION
+ { "encrypt", 'x', NULL, 0,
+ "encrypt all data transfer",
+ GRID+1 },
+# endif
+# undef GRID
+#endif
+ { NULL, 0, NULL, 0, NULL, 0 }
};
static error_t
diff --git a/src/rexec.c b/src/rexec.c
index ebba784..03d8ea9 100644
--- a/src/rexec.c
+++ b/src/rexec.c
@@ -59,16 +59,18 @@ const char *program_authors[] =
};
static struct argp_option options[] = {
- {"user", 'u', "user", 0, "Specify the user"},
- {"host", 'h', "host", 0, "Specify the host"},
- {"password", 'p', "password", 0, "Specify the password"},
- {"port", 'P', "port", 0, "Specify the port to connect to"},
- {"noerr", 'n', NULL, 0, "Disable the stderr stream"},
- {"error", 'e', "error", 0, "Specify a TCP port to use for stderr"},
- {"ipv4", '4', NULL, 0, "Use IPv4 address space."},
- {"ipv6", '6', NULL, 0, "Use IPv6 address space."},
- {"ipany", 'a', NULL, 0, "Allow any address family. (default)"},
- { 0 }
+#define GRP 10
+ {"user", 'u', "user", 0, "Specify the user", GRP},
+ {"host", 'h', "host", 0, "Specify the host", GRP},
+ {"password", 'p', "password", 0, "Specify the password", GRP},
+ {"port", 'P', "port", 0, "Specify the port to connect to", GRP},
+ {"noerr", 'n', NULL, 0, "Disable the stderr stream", GRP},
+ {"error", 'e', "error", 0, "Specify a TCP port to use for stderr", GRP},
+ {"ipv4", '4', NULL, 0, "Use IPv4 address space.", GRP},
+ {"ipv6", '6', NULL, 0, "Use IPv6 address space.", GRP},
+ {"ipany", 'a', NULL, 0, "Allow any address family. (default)", GRP},
+#undef GRP
+ { NULL, 0, NULL, 0, NULL, 0 }
};
struct arguments
@@ -125,7 +127,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {options, parse_opt, args_doc, doc, NULL, NULL, NULL};
static void do_rexec (struct arguments *arguments);
diff --git a/src/rexecd.c b/src/rexecd.c
index f8b1c55..ea79c24 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -130,8 +130,8 @@ static struct pam_conv pam_conv = { rexec_conv, NULL };
static int logging = 0;
static struct argp_option options[] = {
- { "logging", 'l', NULL, 0, "logging of requests and errors" },
- { NULL }
+ { "logging", 'l', NULL, 0, "logging of requests and errors", 1 },
+ { NULL, 0, NULL, 0, NULL, 0 }
};
static error_t
diff --git a/src/rlogin.c b/src/rlogin.c
index 12d3eae..a2ab0bf 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -236,7 +236,13 @@ static struct argp_option argp_options[] = {
{"no-escape", 'E', NULL, 0, "stops any character from being recognized as "
"an escape character", GRP+1},
{"user", 'l', "USER", 0, "run as USER on the remote system", GRP+1},
+#if defined WITH_ORCMD_AF || defined WITH_RCMD_AF || defined SHISHI
+ { "ipv4", '4', NULL, 0, "use only IPv4", GRP+1 },
+ { "ipv6", '6', NULL, 0, "use only IPv6", GRP+1 },
+#endif
+#undef GRP
#if defined KERBEROS || defined SHISHI
+# define GRP 10
# ifdef ENCRYPTION
{"encrypt", 'x', NULL, 0, "turns on encryption for all data passed via "
"the rlogin session", GRP+1},
@@ -244,13 +250,9 @@ static struct argp_option argp_options[] = {
{"kerberos", 'K', NULL, 0, "turns off all Kerberos authentication", GRP+1},
{"realm", 'k', "REALM", 0, "obtain tickets for the remote host in REALM "
"realm instead of the remote's realm", GRP+1},
+# undef GRP
#endif /* KERBEROS || SHISHI */
-#if defined WITH_ORCMD_AF || defined WITH_RCMD_AF || defined SHISHI
- { "ipv4", '4', NULL, 0, "use only IPv4" },
- { "ipv6", '6', NULL, 0, "use only IPv6" },
-#endif
-#undef GRP
- {NULL}
+ {NULL, 0, NULL, 0, NULL, 0}
};
static error_t
@@ -325,7 +327,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ {argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL};
int
main (int argc, char *argv[])
diff --git a/src/rlogind.c b/src/rlogind.c
index 3d2f987..2d42271 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -277,37 +277,41 @@ const char *program_authors[] = {
};
static struct argp_option options[] = {
+#define GRP 10
{ "allow-root", 'o', NULL, 0,
- "allow uid == 0 to login, disabled by default" },
+ "allow uid == 0 to login, disabled by default", GRP },
{ "verify-hostname", 'a', NULL, 0,
- "ask hostname for verification" },
+ "ask hostname for verification", GRP },
{ "daemon", 'd', NULL, 0,
- "daemon mode" },
+ "daemon mode", GRP },
#ifdef HAVE___CHECK_RHOSTS_FILE
{ "no-rhosts", 'l', NULL, 0,
- "ignore .rhosts file" },
+ "ignore .rhosts file", GRP },
#endif
{ "no-keepalive", 'n', NULL, 0,
- "do not set SO_KEEPALIVE" },
+ "do not set SO_KEEPALIVE", GRP },
{ "local-domain", 'L', "NAME", 0,
- "set local domain name" },
+ "set local domain name", GRP },
+ { "debug", 'D', "LEVEL", OPTION_ARG_OPTIONAL,
+ "set debug level", GRP },
+ { "port", 'p', "PORT", 0,
+ "listen on given port (valid only in daemon mode)", GRP },
+ { "reverse-required", 'r', NULL, 0,
+ "require reverse resolving of a remote host IP", GRP },
+#undef GRP
#if defined KERBEROS || defined SHISHI
+# define GRP 20
{ "kerberos", 'k', NULL, 0,
- "use kerberos IV/V authentication" },
+ "use kerberos IV/V authentication", GRP },
{ "server-principal", 'S', "NAME", 0,
- "set Kerberos server name, overriding canonical hostname" },
-#endif
-#if defined ENCRYPTION
+ "set Kerberos server name, overriding canonical hostname", GRP },
+# if defined ENCRYPTION
{ "encrypt", 'x', NULL, 0,
- "use DES encryption" },
+ "use DES encryption", GRP },
+# endif
+# undef GRP
#endif
- { "debug", 'D', "LEVEL", OPTION_ARG_OPTIONAL,
- "set debug level" },
- { "port", 'p', "PORT", 0,
- "listen on given port (valid only in daemon mode)" },
- { "reverse-required", 'r', NULL, 0,
- "require reverse resolving of a remote host IP" },
- { NULL }
+ { NULL, 0, NULL, 0, NULL, 0 }
};
static error_t
@@ -389,7 +393,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = { options, parse_opt, NULL, doc};
+static struct argp argp = { options, parse_opt, NULL, doc, NULL, NULL, NULL};
diff --git a/src/rsh.c b/src/rsh.c
index 5875dd1..1621fa2 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -137,32 +137,37 @@ const char args_doc[] = "address@hidden [COMMAND
[ARG...]]";
const char doc[] = "remote shell";
static struct argp_option options[] = {
+#define GRP 10
{ "debug", 'd', NULL, 0,
- "turns on socket debugging (see setsockopt(2))" },
+ "turns on socket debugging (see setsockopt(2))", GRP },
{ "user", 'l', "USER", 0,
- "run as USER on the remote system" },
+ "run as USER on the remote system", GRP },
{ "escape", 'e', "CHAR", 0,
- "allows user specification of the escape character (``~'' by default)" },
+ "allows user specification of the escape "
+ "character (``~'' by default)", GRP },
{ "8-bit", '8', NULL, 0,
- "allows an eight-bit input data path at all times" },
+ "allows an eight-bit input data path at all times", GRP },
{ "no-input", 'n', NULL, 0,
- "use /dev/null as input" },
+ "use /dev/null as input", GRP },
+#if defined WITH_ORCMD_AF || defined WITH_RCMD_AF || defined SHISHI
+ { "ipv4", '4', NULL, 0, "use only IPv4", GRP },
+ { "ipv6", '6', NULL, 0, "use only IPv6", GRP },
+#endif
+#undef GRP
#if defined KERBEROS || defined SHISHI
+# define GRP 20
{ "kerberos", 'K', NULL, 0,
- "turns off all Kerberos authentication" },
+ "turns off all Kerberos authentication", GRP },
{ "realm", 'k', "REALM", 0,
"obtain tickets for a remote host in REALM, "
- "instead of the remote host's default realm" },
+ "instead of the remote host's default realm", GRP },
# ifdef ENCRYPTION
{ "encrypt", 'x', NULL, 0,
- "encrypt all data transfer" },
+ "encrypt all data transfer", GRP },
# endif /* ENCRYPTION */
+# undef GRP
#endif /* KERBEROS || SHISHI */
-#if defined WITH_ORCMD_AF || defined WITH_RCMD_AF || defined SHISHI
- { "ipv4", '4', NULL, 0, "use only IPv4" },
- { "ipv6", '6', NULL, 0, "use only IPv6" },
-#endif
- { NULL }
+ { NULL, 0, NULL, 0, NULL, 0 }
};
static error_t
@@ -222,7 +227,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = { options, parse_opt, args_doc, doc };
+static struct argp argp =
+ { options, parse_opt, args_doc, doc, NULL, NULL, NULL };
int
diff --git a/src/rshd.c b/src/rshd.c
index 03965eb..9a8c6ae 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -207,27 +207,31 @@ char *servername = NULL;
#endif /* KERBEROS || SHISHI */
static struct argp_option options[] = {
+#define GRP 10
{ "verify-hostname", 'a', NULL, 0,
- "ask hostname for verification" },
+ "ask hostname for verification", GRP },
#ifdef HAVE___CHECK_RHOSTS_FILE
{ "no-rhosts", 'l', NULL, 0,
- "ignore .rhosts file" },
+ "ignore .rhosts file", GRP },
#endif
{ "no-keepalive", 'n', NULL, 0,
- "do not set SO_KEEPALIVE" },
+ "do not set SO_KEEPALIVE", GRP },
{ "log-sessions", 'L', NULL, 0,
- "log successful logins" },
+ "log successful logins", GRP },
+#undef GRP
#if defined KERBEROS || defined SHISHI
+# define GRP 20
/* FIXME: The option semantics does not match that of other r* utilities */
{ "kerberos", 'k', NULL, 0,
- "use kerberos authentication" },
+ "use kerberos authentication", GRP },
/* FIXME: Option name is misleading */
{ "vacuous", 'v', NULL, 0,
- "fail for non-Kerberos authentication" },
+ "fail for non-Kerberos authentication", GRP },
{ "server-principal", 'S', "NAME", 0,
- "set Kerberos server name, overriding canonical hostname" },
+ "set Kerberos server name, overriding canonical hostname", GRP },
+# undef GRP
#endif /* KERBEROS */
- { NULL }
+ { NULL, 0, NULL, 0, NULL, 0 }
};
#ifdef HAVE___CHECK_RHOSTS_FILE
@@ -298,7 +302,7 @@ const char doc[] =
#else /* !WITH_PAM */
"Remote shell server.";
#endif
-static struct argp argp = { options, parse_opt, NULL, doc};
+static struct argp argp = { options, parse_opt, NULL, doc, NULL, NULL, NULL};
/* Remote shell server. We're invoked by the rcmd(3) function. */
diff --git a/telnet/commands.c b/telnet/commands.c
index b511e4c..09b17f4 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -819,7 +819,7 @@ static struct togglelist Togglelist[] = {
lclchars,
&localchars,
"recognize certain control characters"},
- {" ", "", 0}, /* empty line */
+ {" ", "", 0, NULL, NULL}, /* empty line */
#if defined unix && defined TN3270
{"apitrace",
"(debugging) toggle tracing of API transactions",
@@ -859,11 +859,11 @@ static struct togglelist Togglelist[] = {
"print hexadecimal representation of terminal traffic"},
{"?",
0,
- togglehelp},
+ togglehelp, NULL, NULL},
{"help",
0,
- togglehelp},
- {0}
+ togglehelp, NULL, NULL},
+ {NULL, NULL, 0, NULL, NULL}
};
static int
@@ -982,13 +982,13 @@ static struct setlist Setlist[] = {
{"rlogin", "rlogin escape character", 0, &rlogin},
{"tracefile", "file to write trace information to", SetNetTrace,
(cc_t *) NetTraceFile},
- {" ", ""},
+ {" ", "", 0, NULL},
{" ", "The following need 'localchars' to be toggled true", 0, 0},
{"flushoutput", "character to cause an Abort Output", 0, termFlushCharp},
{"interrupt", "character to cause an Interrupt Process", 0, termIntCharp},
{"quit", "character to cause an Abort process", 0, termQuitCharp},
{"eof", "character to cause an EOF ", 0, termEofCharp},
- {" ", ""},
+ {" ", "", 0, NULL},
{" ", "The following are for local editing in linemode", 0, 0},
{"erase", "character to use to erase a character", 0, termEraseCharp},
{"kill", "character to use to erase a line", 0, termKillCharp},
@@ -1001,7 +1001,7 @@ static struct setlist Setlist[] = {
{"forw1", "alternate end of line character", 0, termForw1Charp},
{"forw2", "alternate end of line character", 0, termForw2Charp},
{"ayt", "alternate AYT character", 0, termAytCharp},
- {0}
+ {NULL, NULL, 0, NULL}
};
#if defined CRAY && !defined __STDC__
@@ -1314,16 +1314,16 @@ struct modelist
extern int modehelp (void);
static struct modelist ModeList[] = {
- {"character", "Disable LINEMODE option", docharmode, 1},
+ {"character", "Disable LINEMODE option", docharmode, 1, 0},
#ifdef KLUDGELINEMODE
- {"", "(or disable obsolete line-by-line mode)", 0},
+ {"", "(or disable obsolete line-by-line mode)", NULL, 0, 0},
#endif
- {"line", "Enable LINEMODE option", dolinemode, 1},
+ {"line", "Enable LINEMODE option", dolinemode, 1, 0},
#ifdef KLUDGELINEMODE
- {"", "(or enable obsolete line-by-line mode)", 0},
+ {"", "(or enable obsolete line-by-line mode)", NULL, 0, 0},
#endif
- {"", "", 0},
- {"", "These require the LINEMODE option to be enabled", 0},
+ {"", "", NULL, 0, 0},
+ {"", "These require the LINEMODE option to be enabled", NULL, 0, 0},
{"isig", "Enable signal trapping", set_mode, 1, MODE_TRAPSIG},
{"+isig", 0, set_mode, 1, MODE_TRAPSIG},
{"-isig", "Disable signal trapping", clear_mode, 1, MODE_TRAPSIG},
@@ -1337,13 +1337,13 @@ static struct modelist ModeList[] = {
{"+litecho", 0, set_mode, 1, MODE_LIT_ECHO},
{"-litecho", "Disable literal character echo", clear_mode, 1,
MODE_LIT_ECHO},
- {"help", 0, modehelp, 0},
+ {"help", 0, modehelp, 0, 0},
#ifdef KLUDGELINEMODE
- {"kludgeline", 0, dokludgemode, 1},
+ {"kludgeline", 0, dokludgemode, 1, 0},
#endif
- {"", "", 0},
- {"?", "Print help information", modehelp, 0},
- {0},
+ {"", "", NULL, 0, 0},
+ {"?", "Print help information", modehelp, 0, 0},
+ {NULL, NULL, NULL, 0, 0},
};
@@ -1678,7 +1678,7 @@ struct slclist SlcList[] = {
slc_mode_import, 0},
{"help", 0, slc_help, 0},
{"?", "Print help information", slc_help, 0},
- {0},
+ {NULL, NULL, NULL, 0},
};
static void
@@ -1775,7 +1775,7 @@ struct envlist EnvList[] = {
#endif
{"help", 0, env_help, 0},
{"?", "Print help information", env_help, 0},
- {0},
+ {NULL, NULL, NULL, 0},
};
static void
@@ -2113,7 +2113,7 @@ struct authlist AuthList[] = {
auth_enable, 1},
{"help", 0, auth_help, 0},
{"?", "Print help information", auth_help, 0},
- {0},
+ {NULL, NULL, NULL, 0},
};
static int
@@ -2222,7 +2222,7 @@ struct encryptlist EncryptList[] = {
EncryptStatus, 0, 0, 0},
{"help", 0, EncryptHelp, 0, 0, 0},
{"?", "Print help information", EncryptHelp, 0, 0, 0},
- {0},
+ {NULL, NULL, NULL, 0, 0, 0},
};
static int
@@ -2831,7 +2831,7 @@ static Command cmdtab[] = {
#endif
{"environ", envhelp, env_cmd, 0},
{"?", helphelp, help, 0},
- {0}
+ {NULL, NULL, NULL, 0}
};
static char crmodhelp[] = "deprecated command -- use 'toggle crmod' instead";
@@ -2841,7 +2841,7 @@ static Command cmdtab2[] = {
{"help", 0, help, 0},
{"escape", escapehelp, setescape, 0},
{"crmod", crmodhelp, togcrmod, 0},
- {0}
+ {NULL, NULL, NULL, 0}
};
diff --git a/telnet/main.c b/telnet/main.c
index 0c5b219..5a679ac 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -190,7 +190,7 @@ static struct argp_option argp_options[] = {
{ "noasyncnet", OPTION_NOASYNCNET, NULL, 0, "", GRID+1 },
# undef GRID
#endif
- { NULL }
+ { NULL, 0, NULL, 0, NULL, 0 }
};
static error_t
@@ -319,7 +319,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
const char args_doc[] = "[HOST [PORT]]";
const char doc[] = "Login to remote system HOST "
"(optionally, on service port PORT)";
-static struct argp argp = { argp_options, parse_opt, args_doc, doc};
+static struct argp argp =
+ { argp_options, parse_opt, args_doc, doc, NULL, NULL, NULL };
diff --git a/telnet/network.c b/telnet/network.c
index 8b5b327..3640ffb 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -95,7 +95,7 @@ init_network (void)
int
stilloob (void)
{
- static struct timeval timeout = { 0 };
+ static struct timeval timeout = { 0, 0 };
fd_set excepts;
int value;
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 58df0ef..2973114 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1068,7 +1068,7 @@ process_rings (int netin, int netout, int netex, int
ttyin, int ttyout,
* time (TN3270 mode only).
*/
int returnValue = 0;
- static struct timeval TimeValue = { 0 };
+ static struct timeval TimeValue = { 0, 0 };
int nfds = 0;
if (netout)
diff --git a/whois/whois.c b/whois/whois.c
index 07e1f7d..23a90d7 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -61,40 +61,42 @@ const char *port = NULL;
int nopar = 0;
static struct argp_option ripe_argp_options[] = {
+#define GRP 10
{ NULL, 'a', NULL, 0,
- "search all databases" },
+ "search all databases", GRP },
{ NULL, 'F', NULL, 0,
- "fast raw output (implies -r)" },
+ "fast raw output (implies -r)", GRP },
{ NULL, 'g', "SOURCE:FIRST-LAST", 0,
- "find updates from SOURCE from serial FIRST to LAST" },
+ "find updates from SOURCE from serial FIRST to LAST", GRP },
{ NULL, 'i', "ATTR[,ATTR]...", 0,
- "do an inverse lookup for specified ATTRibutes" },
+ "do an inverse lookup for specified ATTRibutes", GRP },
{ NULL, 'l', NULL, 0,
- "one level less specific lookup (RPSL only)" },
+ "one level less specific lookup (RPSL only)", GRP },
{ NULL, 'L', NULL, 0,
- "find all Less specific matches" },
+ "find all Less specific matches", GRP },
{ NULL, 'M', NULL, 0,
- "find all More specific matches" },
+ "find all More specific matches", GRP },
{ NULL, 'm', NULL, 0,
- "find first level more specific matches" },
+ "find first level more specific matches", GRP },
{ NULL, 'r', NULL, 0,
- "turn off recursive lookups" },
+ "turn off recursive lookups", GRP },
{ NULL, 'R', NULL, 0,
"force to show local copy of the domain object even "
- "if it contains referral" },
+ "if it contains referral", GRP },
{ NULL, 'S', NULL, 0,
- "tell server to leave out syntactic sugar" },
+ "tell server to leave out syntactic sugar", GRP },
{ NULL, 's', "SOURCE[,SOURCE]...", 0,
- "search the database from SOURCE" },
+ "search the database from SOURCE", GRP },
{ NULL, 'T', "TYPE[,TYPE]...", 0,
- "only look for objects of TYPE" },
+ "only look for objects of TYPE", GRP },
{ NULL, 'q', "version|sources", 0,
- "query specified server info (RPSL only)" },
+ "query specified server info (RPSL only)", GRP },
{ NULL, 't', "TYPE", 0,
- "requests template for object of TYPE ('all' for a list)" },
+ "requests template for object of TYPE ('all' for a list)", GRP },
{ NULL, 'x', NULL, 0,
- "exact match only (RPSL only)" },
- { NULL }
+ "exact match only (RPSL only)", GRP },
+#undef GRP
+ { NULL, 0, NULL, 0, NULL, 0 }
};
static error_t
@@ -117,18 +119,21 @@ ripe_argp_parser (int key, char *arg, struct argp_state
*state)
return ARGP_ERR_UNKNOWN;
}
-static struct argp ripe_argp = { ripe_argp_options, ripe_argp_parser };
+static struct argp ripe_argp =
+ { ripe_argp_options, ripe_argp_parser, NULL, NULL, NULL, NULL, NULL };
static struct argp_option gwhois_argp_options[] = {
+#define GRP 10
{ "verbose", 'V', NULL, 0,
- "explain what is being done" },
+ "explain what is being done", GRP },
{ "server", 'h', "HOST", 0,
- "connect to server HOST"},
+ "connect to server HOST", GRP},
{ "port", 'p', "PORT", 0,
- "connect to PORT" },
+ "connect to PORT", GRP },
{ NULL, 'H', NULL, 0,
- "hide legal disclaimers" },
- { NULL }
+ "hide legal disclaimers", GRP },
+#undef GRP
+ { NULL, 0, NULL, 0, NULL, 0 }
};
static error_t
@@ -170,7 +175,7 @@ struct argp_child gwhois_argp_children[] = {
"RIPE-specific options",
0
},
- { NULL }
+ { NULL, 0, NULL, 0 }
};
static struct argp gwhois_argp = {
@@ -178,7 +183,9 @@ static struct argp gwhois_argp = {
gwhois_argp_parser,
"OBJECT...",
"client for the whois directory service",
- gwhois_argp_children
+ gwhois_argp_children,
+ NULL,
+ NULL
};
const char *program_authors[] =
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 38 ++++++++++++++++++++++++++++++++++
ftp/cmds.c | 2 +-
ftp/cmdtab.c | 2 +-
ftp/main.c | 5 ++-
src/dnsdomainname.c | 2 +-
src/hostname.c | 5 ++-
src/logger.c | 27 +++++++++++++----------
src/rcp.c | 31 +++++++++++++++------------
src/rexec.c | 25 ++++++++++++---------
src/rexecd.c | 4 +-
src/rlogin.c | 17 +++++++++------
src/rlogind.c | 42 ++++++++++++++++++++-----------------
src/rsh.c | 34 +++++++++++++++++------------
src/rshd.c | 22 +++++++++++--------
telnet/commands.c | 48 +++++++++++++++++++++---------------------
telnet/main.c | 5 ++-
telnet/network.c | 2 +-
telnet/sys_bsd.c | 2 +-
whois/whois.c | 57 ++++++++++++++++++++++++++++----------------------
19 files changed, 222 insertions(+), 148 deletions(-)
hooks/post-receive
--
GNU Inetutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-172-g8d5332f,
Mats Erik Andersson <=