From 542921b61b504b009f5ab790d9743a170ae51168 Mon Sep 17 00:00:00 2001
From: matt mooney <mfm@muteddisk.com>
Date: Sun, 19 Jun 2011 22:44:36 -0700
Subject: [PATCH] --- yaml --- r: 259972 b: refs/heads/master c:
 c93be5b178ca7f3f4599da7a26a5828ab36aafb4 h: refs/heads/master v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/staging/usbip/userspace/src/usbip.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d902c63dd79d..17065a509b94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2fb62b371703e70593780ad40333c2e21030df8
+refs/heads/master: c93be5b178ca7f3f4599da7a26a5828ab36aafb4
diff --git a/trunk/drivers/staging/usbip/userspace/src/usbip.c b/trunk/drivers/staging/usbip/userspace/src/usbip.c
index 8940cd0ae6b7..cdfe4c2d9cbe 100644
--- a/trunk/drivers/staging/usbip/userspace/src/usbip.c
+++ b/trunk/drivers/staging/usbip/userspace/src/usbip.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 
 #include <getopt.h>
+#include <syslog.h>
 
 #include "usbip_common.h"
 #include "usbip.h"
@@ -33,7 +34,7 @@ static int usbip_version(int argc, char *argv[]);
 static const char usbip_version_string[] = PACKAGE_STRING;
 
 static const char usbip_usage_string[] =
-	"usbip [--debug] [version]\n"
+	"usbip [--debug] [--log] [version]\n"
 	"             [help] <command> <args>\n";
 
 static void usbip_usage(void)
@@ -138,12 +139,15 @@ int main(int argc, char *argv[])
 {
 	static const struct option opts[] = {
 		{ "debug", no_argument, NULL, 'd' },
-		{ NULL, 0, NULL, 0 }
+		{ "log",   no_argument, NULL, 'l' },
+		{ NULL,    0,           NULL,  0  }
 	};
+
 	char *cmd;
 	int opt;
 	int i, rc = -1;
 
+	usbip_use_stderr = 1;
 	opterr = 0;
 	for (;;) {
 		opt = getopt_long(argc, argv, "+d", opts, NULL);
@@ -154,7 +158,10 @@ int main(int argc, char *argv[])
 		switch (opt) {
 		case 'd':
 			usbip_use_debug = 1;
-			usbip_use_stderr = 1;
+			break;
+		case 'l':
+			usbip_use_syslog = 1;
+			openlog("", LOG_PID, LOG_USER);
 			break;
 		default:
 			goto err_out;