summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-12-05 18:35:21 +0100
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-12-06 11:03:29 +0100
commitc17641d483279151748dc7cec8e9e44b0da11623 (patch)
tree6c00500dd93460dae01eea5fb3f5bc17e018c57e
parent1525d7b86f317ebbf19ba69b597d6ff73c71fe5e (diff)
downloadouroboros-c17641d483279151748dc7cec8e9e44b0da11623.tar.gz
ouroboros-c17641d483279151748dc7cec8e9e44b0da11623.zip
tools: Fix issues in irm bind/unbind
Fixes a segmentation fault in irm unbind api when no pid is specified and improves the help information for bind/unbind.
-rw-r--r--src/tools/irm/irm_bind.c1
-rw-r--r--src/tools/irm/irm_unbind.c1
-rw-r--r--src/tools/irm/irm_unbind_ap.c3
-rw-r--r--src/tools/irm/irm_unbind_api.c5
-rw-r--r--src/tools/irm/irm_unbind_ipcp.c3
5 files changed, 9 insertions, 4 deletions
diff --git a/src/tools/irm/irm_bind.c b/src/tools/irm/irm_bind.c
index aafa2f75..2b5a6cf4 100644
--- a/src/tools/irm/irm_bind.c
+++ b/src/tools/irm/irm_bind.c
@@ -31,6 +31,7 @@
static void usage(void)
{
printf("Usage: irm bind [OPERATION]\n"
+ "\n"
"where OPERATION = {ap api ipcp help}\n");
}
diff --git a/src/tools/irm/irm_unbind.c b/src/tools/irm/irm_unbind.c
index a6b27907..962e9555 100644
--- a/src/tools/irm/irm_unbind.c
+++ b/src/tools/irm/irm_unbind.c
@@ -31,6 +31,7 @@
static void usage(void)
{
printf("Usage: irm unbind [OPERATION]\n"
+ "\n"
"where OPERATION = {ap api ipcp help}\n");
}
diff --git a/src/tools/irm/irm_unbind_ap.c b/src/tools/irm/irm_unbind_ap.c
index 8ad3d670..f3f16ee1 100644
--- a/src/tools/irm/irm_unbind_ap.c
+++ b/src/tools/irm/irm_unbind_ap.c
@@ -32,7 +32,8 @@
static void usage(void)
{
printf("Usage: irm unbind ap <ap>\n"
- " [name <name>, omit: remove all AP info]\n");
+ " [name <name> (default: remove all AP info)]"
+ "\n");
}
int do_unbind_ap(int argc, char ** argv)
diff --git a/src/tools/irm/irm_unbind_api.c b/src/tools/irm/irm_unbind_api.c
index d332f438..fdfc2374 100644
--- a/src/tools/irm/irm_unbind_api.c
+++ b/src/tools/irm/irm_unbind_api.c
@@ -33,7 +33,8 @@
static void usage(void)
{
printf("Usage: irm unbind api <pid>\n"
- " [name <name>, omit: remove all AP-I info]\n");
+ " [name <name> (default: remove all AP-I info)]"
+ "\n");
}
int do_unbind_api(int argc, char ** argv)
@@ -41,7 +42,7 @@ int do_unbind_api(int argc, char ** argv)
pid_t api = -1;
char * name = NULL;
- while (argc > 0) {
+ while (argc > 1) {
if (matches(*argv, "name") == 0) {
name = *(argv + 1);
++argv;
diff --git a/src/tools/irm/irm_unbind_ipcp.c b/src/tools/irm/irm_unbind_ipcp.c
index 33d7a818..16dd024b 100644
--- a/src/tools/irm/irm_unbind_ipcp.c
+++ b/src/tools/irm/irm_unbind_ipcp.c
@@ -33,7 +33,8 @@
static void usage(void)
{
printf("Usage: irm unbind ipcp <name>\n"
- " [name <name>, omit: remove all information.\n");
+ " [name <name> (default: remove all IPCP info)]"
+ "\n");
}
int do_unbind_ipcp(int argc, char ** argv)