summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
Diffstat (limited to 'networking')
-rw-r--r--networking/ftpgetput.c17
-rw-r--r--networking/ipcalc.c19
-rw-r--r--networking/udhcp/dhcpc.c43
-rw-r--r--networking/udhcp/dumpleases.c13
-rw-r--r--networking/wget.c27
5 files changed, 57 insertions, 62 deletions
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 54b5f5a..011fbac 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -287,14 +287,13 @@ int ftp_send(ftp_host_info_t *server, FILE *control_stream,
#define FTPGETPUT_OPT_PORT 16
#if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS
-static const struct option ftpgetput_long_options[] = {
- { "continue", 1, NULL, 'c' },
- { "verbose", 0, NULL, 'v' },
- { "username", 1, NULL, 'u' },
- { "password", 1, NULL, 'p' },
- { "port", 1, NULL, 'P' },
- { 0, 0, 0, 0 }
-};
+static const char ftpgetput_longopts[] =
+ "continue\0" Required_argument "c"
+ "verbose\0" No_argument "v"
+ "username\0" Required_argument "u"
+ "password\0" Required_argument "p"
+ "port\0" Required_argument "P"
+ "\0";
#endif
int ftpgetput_main(int argc, char **argv);
@@ -329,7 +328,7 @@ int ftpgetput_main(int argc, char **argv)
* Decipher the command line
*/
#if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS
- applet_long_options = ftpgetput_long_options;
+ applet_long_options = ftpgetput_longopts;
#endif
opt_complementary = "=3"; /* must have 3 params */
opt = getopt32(argc, argv, "cvu:p:P:", &server->user, &server->password, &port);
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index a39ad1a..32b939f 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -63,17 +63,16 @@ int get_prefix(unsigned long netmask);
#define SILENT 0x20
#if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
- static const struct option long_options[] = {
- { "netmask", no_argument, NULL, 'm' },
- { "broadcast", no_argument, NULL, 'b' },
- { "network", no_argument, NULL, 'n' },
+ static const char ipcalc_longopts[] =
+ "netmask\0" No_argument "m"
+ "broadcast\0" No_argument "b"
+ "network\0" No_argument "n"
# if ENABLE_FEATURE_IPCALC_FANCY
- { "prefix", no_argument, NULL, 'p' },
- { "hostname", no_argument, NULL, 'h' },
- { "silent", no_argument, NULL, 's' },
+ "prefix\0" No_argument "p"
+ "hostname\0" No_argument "h"
+ "silent\0" No_argument "s"
# endif
- { NULL, 0, NULL, 0 }
- };
+ "\0";
#endif
int ipcalc_main(int argc, char **argv);
@@ -86,7 +85,7 @@ int ipcalc_main(int argc, char **argv)
char *ipstr;
#if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
- applet_long_options = long_options;
+ applet_long_options = ipcalc_longopts;
#endif
opt = getopt32(argc, argv, "mbn" USE_FEATURE_IPCALC_FANCY("phs"));
argc -= optind;
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 3165c2d..2b95c32 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -181,27 +181,26 @@ int udhcpc_main(int argc, char **argv)
OPT_v = 1 << 17,
};
#if ENABLE_GETOPT_LONG
- static const struct option arg_options[] = {
- { "clientid", required_argument, 0, 'c' },
- { "clientid-none", no_argument, 0, 'C' },
- { "vendorclass", required_argument, 0, 'V' },
- { "foreground", no_argument, 0, 'f' },
- { "background", no_argument, 0, 'b' },
- { "hostname", required_argument, 0, 'H' },
- { "hostname", required_argument, 0, 'h' },
- { "fqdn", required_argument, 0, 'F' },
- { "interface", required_argument, 0, 'i' },
- { "now", no_argument, 0, 'n' },
- { "pidfile", required_argument, 0, 'p' },
- { "quit", no_argument, 0, 'q' },
- { "release", no_argument, 0, 'R' },
- { "request", required_argument, 0, 'r' },
- { "script", required_argument, 0, 's' },
- { "timeout", required_argument, 0, 'T' },
- { "version", no_argument, 0, 'v' },
- { "retries", required_argument, 0, 't' },
- { 0, 0, 0, 0 }
- };
+ static const char udhcpc_longopts[] =
+ "clientid\0" Required_argument "c"
+ "clientid-none\0" No_argument "C"
+ "vendorclass\0" Required_argument "V"
+ "foreground\0" No_argument "f"
+ "background\0" No_argument "b"
+ "hostname\0" Required_argument "H"
+ "hostname\0" Required_argument "h"
+ "fqdn\0" Required_argument "F"
+ "interface\0" Required_argument "i"
+ "now\0" No_argument "n"
+ "pidfile\0" Required_argument "p"
+ "quit\0" No_argument "q"
+ "release\0" No_argument "R"
+ "request\0" Required_argument "r"
+ "script\0" Required_argument "s"
+ "timeout\0" Required_argument "T"
+ "version\0" No_argument "v"
+ "retries\0" Required_argument "t"
+ "\0";
#endif
/* Default options. */
client_config.interface = "eth0";
@@ -213,7 +212,7 @@ int udhcpc_main(int argc, char **argv)
opt_complementary = "c--C:C--c" // mutually exclusive
":hH:Hh"; // -h and -H are the same
#if ENABLE_GETOPT_LONG
- applet_long_options = arg_options;
+ applet_long_options = udhcpc_longopts;
#endif
opt = getopt32(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v",
&str_c, &str_V, &str_h, &str_h, &str_F,
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 95df7ea..fb50d68 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -24,14 +24,13 @@ int dumpleases_main(int argc, char **argv)
OPT_f = 0x4, // -f
};
#if ENABLE_GETOPT_LONG
- static const struct option options[] = {
- { "absolute", no_argument, 0, 'a' },
- { "remaining", no_argument, 0, 'r' },
- { "file", required_argument, 0, 'f' },
- { NULL, 0, 0, 0 }
- };
+ static const char dumpleases_longopts[] =
+ "absolute\0" No_argument "a"
+ "remaining\0" No_argument "r"
+ "file\0" Required_argument "f"
+ "\0";
- applet_long_options = options;
+ applet_long_options = dumpleases_longopts;
#endif
opt_complementary = "=0:a--r:r--a";
opt = getopt32(argc, argv, "arf:", &file);
diff --git a/networking/wget.c b/networking/wget.c
index 19ff792..ad09091 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -132,20 +132,19 @@ int wget_main(int argc, char **argv)
WGET_OPT_HEADER = 0x100,
};
#if ENABLE_FEATURE_WGET_LONG_OPTIONS
- static const struct option wget_long_options[] = {
- /* name, has_arg, flag, val */
- { "continue", no_argument, NULL, 'c' },
- { "spider", no_argument, NULL, 's' },
- { "quiet", no_argument, NULL, 'q' },
- { "output-document", required_argument, NULL, 'O' },
- { "directory-prefix", required_argument, NULL, 'P' },
- { "proxy", required_argument, NULL, 'Y' },
- { "user-agent", required_argument, NULL, 'U' },
- { "passive-ftp", no_argument, NULL, 0xff },
- { "header", required_argument, NULL, 0xfe },
- { 0, 0, 0, 0 }
- };
- applet_long_options = wget_long_options;
+ static const char wget_longopts[] =
+ /* name, has_arg, val */
+ "continue\0" No_argument "c"
+ "spider\0" No_argument "s"
+ "quiet\0" No_argument "q"
+ "output-document\0" Required_argument "O"
+ "directory-prefix\0" Required_argument "P"
+ "proxy\0" Required_argument "Y"
+ "user-agent\0" Required_argument "U"
+ "passive-ftp\0" No_argument "\xff"
+ "header\0" Required_argument "\xfe"
+ "\0";
+ applet_long_options = wget_longopts;
#endif
/* server.allocated = target.allocated = NULL; */
opt_complementary = "-1" USE_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
generated by cgit v1.1 at 2024-12-27 10:48:43 +0000