X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Flttng.c;h=69b563d4a643eb80db6718673602ebe67efb9c4b;hp=e488cc5666130e683f1095a2eb01631f5b1ea8af;hb=734f79bf717d87817623d382c59086dc9e8ef610;hpb=322585731ced1adba36cddcb8bdd5d997d1b2e3e

diff --git a/lttng/lttng.c b/lttng/lttng.c
index e488cc566..69b563d4a 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -359,6 +359,23 @@ end:
 	return ret;
 }
 
+/*
+ * Check for the "help" option in the argv. If found, return 1 else return 0.
+ */
+static int check_help_command(int argc, char **argv)
+{
+	int i;
+
+	for (i = 0; i < argc; i++) {
+		if ((strncmp(argv[i], "-h", 2) == 0) ||
+				strncmp(argv[i], "--h", 3) == 0) {
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
 /*
  *  parse_args
  *
@@ -380,7 +397,7 @@ static int parse_args(int argc, char **argv)
 			usage(stderr);
 			goto error;
 		case 'v':
-			opt_verbose = 1;
+			opt_verbose += 1;
 			break;
 		case 'q':
 			opt_quiet = 1;
@@ -414,7 +431,8 @@ static int parse_args(int argc, char **argv)
 	}
 
 	/* Spawn session daemon if needed */
-	if (opt_no_sessiond == 0 && (check_sessiond() < 0)) {
+	if (opt_no_sessiond == 0 && check_help_command(argc, argv) == 0 &&
+			(check_sessiond() < 0)) {
 		goto error;
 	}