X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng%2Fcommands%2Fdisable_events.c;h=60e77bdcf1e66d728176886cf5d995cff0913fed;hb=8b270bdb4dccf5571180a9906084126e90eec949;hp=6ca7dbeeb680134587848aba3e4d3d6a510cb82b;hpb=7d29a2477524f7ee2ee46a94e538e6141f5ecc0e;p=lttng-tools.git

diff --git a/lttng/commands/disable_events.c b/lttng/commands/disable_events.c
index 6ca7dbeeb..60e77bdcf 100644
--- a/lttng/commands/disable_events.c
+++ b/lttng/commands/disable_events.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,9 +25,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_event_list;
 static char *opt_kernel;
@@ -125,6 +125,7 @@ static int disable_events(void)
 
 			/* Copy name and type of the event */
 			strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
+			ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 			ret = lttng_disable_event(&dom, event_name, channel_name);
 			if (ret < 0) {
 				MSG("Unable to disable event %s for channel %s",
@@ -143,7 +144,7 @@ static int disable_events(void)
 			ret = CMD_NOT_IMPLEMENTED;
 			goto error;
 		} else {
-			ERR("Please specify a tracer (kernel or user-space)");
+			ERR("Please specify a tracer (--kernel or --userspace)");
 			goto error;
 		}