X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fset_session.c;h=1f79d6cf08e6f17c97f972a58269cb0b102362f9;hb=487b253b3ec9f187b4c1b425b246e8e74e5ac309;hp=f91935e045072d5d71bf551c0fbb8108b90ee6fe;hpb=679b4943c3b0f451e7f4fbcd804dd8a7a679e253;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/set_session.c b/src/bin/lttng/commands/set_session.c
index f91935e04..1f79d6cf0 100644
--- a/src/bin/lttng/commands/set_session.c
+++ b/src/bin/lttng/commands/set_session.c
@@ -1,19 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * 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; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -61,6 +60,13 @@ static int set_session(void)
 {
 	int ret = CMD_SUCCESS;
 
+	if (opt_session_name && strlen(opt_session_name) > NAME_MAX) {
+		ERR("Session name too long. Length must be lower or equal to %d",
+			NAME_MAX);
+		ret = CMD_ERROR;
+		goto error;
+	}
+
 	ret = config_init(opt_session_name);
 	if (ret < 0) {
 		ERR("Unable to set session name");
@@ -89,12 +95,10 @@ int cmd_set_session(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stderr);
-			ret = CMD_SUCCESS;
+			usage(stdout);
 			goto end;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
-			ret = CMD_SUCCESS;
 			goto end;
 		default:
 			usage(stderr);
@@ -107,11 +111,13 @@ int cmd_set_session(int argc, const char **argv)
 	if (opt_session_name == NULL) {
 		ERR("Missing session name");
 		usage(stderr);
+		ret = CMD_ERROR;
 		goto end;
 	}
 
 	ret = set_session();
 
 end:
+	poptFreeContext(pc);
 	return ret;
 }