From d33f9556f4f2d3fc7de55270764c8edd14b5759d Mon Sep 17 00:00:00 2001 From: matt mooney Date: Sun, 19 Jun 2011 22:44:39 -0700 Subject: [PATCH] --- yaml --- r: 259975 b: refs/heads/master c: 4737d7e3321a2f1e8804ceee3f938eff09593c0a h: refs/heads/master i: 259973: b9dfa1df475be73ffcf432a9bd06fc10516883fd 259971: 5b4656e056de3edfc02f01aeea546871f61b0b71 259967: 44e4d34a96df3e120c04c6cbd9c17d1d1d9b36c3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/usbip/userspace/src/usbip.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6b197afedcf3..3a8b865c96dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25567a3979ed5c6056608f9c0d7574f319283c12 +refs/heads/master: 4737d7e3321a2f1e8804ceee3f938eff09593c0a diff --git a/trunk/drivers/staging/usbip/userspace/src/usbip.c b/trunk/drivers/staging/usbip/userspace/src/usbip.c index cdfe4c2d9cbe..583b179a1126 100644 --- a/trunk/drivers/staging/usbip/userspace/src/usbip.c +++ b/trunk/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); }