lkml.org 
[lkml]   [2011]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 09/22] staging: usbip: userspace: usbip: modify command failure
Date
When a bad option is given, display a message stating such and output
usage. When a bad command is given, output command help.

Signed-off-by: matt mooney <mfm@muteddisk.com>
---
drivers/staging/usbip/userspace/src/usbip.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/usbip/userspace/src/usbip.c b/drivers/staging/usbip/userspace/src/usbip.c
index cdfe4c2..583b179 100644
--- a/drivers/staging/usbip/userspace/src/usbip.c
+++ b/drivers/staging/usbip/userspace/src/usbip.c
@@ -125,13 +125,13 @@ static int usbip_version(int argc, char *argv[])
(void) argc;
(void) argv;

- printf("%s\n", usbip_version_string);
+ printf(PROGNAME " (%s)\n", usbip_version_string);
return 0;
}

static int run_command(const struct command *cmd, int argc, char *argv[])
{
- dbg("running command: `%s'\n", cmd->name);
+ dbg("running command: `%s'", cmd->name);
return cmd->fn(argc, argv);
}

@@ -163,8 +163,11 @@ int main(int argc, char *argv[])
usbip_use_syslog = 1;
openlog("", LOG_PID, LOG_USER);
break;
+ case '?':
+ printf("usbip: invalid option\n");
default:
- goto err_out;
+ usbip_usage();
+ goto out;
}
}

@@ -180,8 +183,8 @@ int main(int argc, char *argv[])
}
}

-err_out:
- usbip_usage();
+ /* invalid command */
+ usbip_help(0, NULL);
out:
return (rc > -1 ? EXIT_SUCCESS : EXIT_FAILURE);
}
--
1.7.5.2


\
 
 \ /
  Last update: 2011-06-20 07:49    [W:1.442 / U:0.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site