diff options
| author | Sander Vrijders <[email protected]> | 2017-08-29 18:37:58 +0200 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2017-08-29 18:47:37 +0200 |
| commit | e533ca60b841193fbdb7d135de3d9e56916445c2 (patch) | |
| tree | 3cdb94c5fd0753e3c440497fcc9cab5e5d09db45 /src | |
| parent | 7d598d4a706e06e7e89218ca9ae071dd630cb2b3 (diff) | |
| download | ouroboros-e533ca60b841193fbdb7d135de3d9e56916445c2.tar.gz ouroboros-e533ca60b841193fbdb7d135de3d9e56916445c2.zip | |
tools: irm: Fix matching of name parameter
The name parameter was not being matched correctly in ipcp connect and
disconnect.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/irm/irm.c | 2 | ||||
| -rw-r--r-- | src/tools/irm/irm_ipcp.c | 3 | ||||
| -rw-r--r-- | src/tools/irm/irm_ipcp_connect.c | 12 | ||||
| -rw-r--r-- | src/tools/irm/irm_ipcp_disconnect.c | 12 |
4 files changed, 15 insertions, 14 deletions
diff --git a/src/tools/irm/irm.c b/src/tools/irm/irm.c index 4e275e48..a77f9b7b 100644 --- a/src/tools/irm/irm.c +++ b/src/tools/irm/irm.c @@ -34,7 +34,7 @@ static void usage(void) { printf("Usage: irm [OPERATION]\n\n" "where OPERATION = {ipcp bind unbind\n" - " register unregister\n"); + " register unregister}\n"); } static int do_help(int argc, char **argv) diff --git a/src/tools/irm/irm_ipcp.c b/src/tools/irm/irm_ipcp.c index 2f7b01c9..fb1a66b9 100644 --- a/src/tools/irm/irm_ipcp.c +++ b/src/tools/irm/irm_ipcp.c @@ -29,7 +29,8 @@ static void usage(void) { printf("Usage: irm ipcp [OPERATION]\n\n" "where OPERATION = {create destroy\n" - " bootstrap enroll help}\n"); + " bootstrap enroll\n" + " connect disconnect help}\n"); } static int do_help(int argc, char **argv) diff --git a/src/tools/irm/irm_ipcp_connect.c b/src/tools/irm/irm_ipcp_connect.c index 168c8d17..3f52e6f8 100644 --- a/src/tools/irm/irm_ipcp_connect.c +++ b/src/tools/irm/irm_ipcp_connect.c @@ -35,10 +35,10 @@ static void usage(void) { printf("Usage: irm ipcp connect\n" - " name <ipcp name>\n" - " comp <COMPONENT>\n" - " dst <name of destination IPCP>\n" - "where COMPONENT = {" DT " " MGMT "},\n\n"); + " name <ipcp name>\n" + " component [COMPONENT]\n" + " dst <name of destination IPCP>\n\n" + "where COMPONENT = {" DT " " MGMT "}\n"); } int do_connect_ipcp(int argc, @@ -51,11 +51,11 @@ int do_connect_ipcp(int argc, ssize_t len = 0; while (argc > 0) { - if (strcmp(*argv, "name") == 0) { + if (matches(*argv, "name") == 0) { name = *(argv + 1); } else if (matches(*argv, "dst") == 0) { dst_name = *(argv + 1); - } else if (matches(*argv, "comp") == 0) { + } else if (matches(*argv, "component") == 0) { comp_name = *(argv + 1); } else { printf("\"%s\" is unknown, try \"irm " diff --git a/src/tools/irm/irm_ipcp_disconnect.c b/src/tools/irm/irm_ipcp_disconnect.c index 8f83f3e8..2a4bbd38 100644 --- a/src/tools/irm/irm_ipcp_disconnect.c +++ b/src/tools/irm/irm_ipcp_disconnect.c @@ -35,10 +35,10 @@ static void usage(void) { printf("Usage: irm ipcp disconnect\n" - " name <ipcp name>\n" - " comp <COMPONENT>\n" - " dst <name of destination IPCP>\n" - "where COMPONENT = {" DT " " MGMT "},\n\n"); + " name <ipcp name>\n" + " component [COMPONENT]\n" + " dst <name of destination IPCP>\n\n" + "where COMPONENT = {" DT " " MGMT "}\n"); } int do_disconnect_ipcp(int argc, @@ -51,11 +51,11 @@ int do_disconnect_ipcp(int argc, ssize_t len = 0; while (argc > 0) { - if (strcmp(*argv, "name") == 0) { + if (matches(*argv, "name") == 0) { name = *(argv + 1); } else if (matches(*argv, "dst") == 0) { dst_name = *(argv + 1); - } else if (matches(*argv, "comp") == 0) { + } else if (matches(*argv, "component") == 0) { comp_name = *(argv + 1); } else { printf("\"%s\" is unknown, try \"irm " |