From ec89eb955236f91e63febe1764123e605641fc52 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 6 Apr 2011 21:51:31 +0000 Subject: Change so that an empty session name always means the current sessions even if given with, for example, -t '', and explicitly forbid empty session names and those containing a : when they are created. --- cmd-new-session.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'cmd-new-session.c') diff --git a/cmd-new-session.c b/cmd-new-session.c index fc847bd2..5eaa5393 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -68,9 +68,15 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx) u_int sx, sy, i; newname = args_get(args, 's'); - if (newname != NULL && session_find(newname) != NULL) { - ctx->error(ctx, "duplicate session: %s", newname); - return (-1); + if (newname != NULL) { + if (!session_check_name(newname)) { + ctx->error(ctx, "bad session name: %s", newname); + return (-1); + } + if (session_find(newname) != NULL) { + ctx->error(ctx, "duplicate session: %s", newname); + return (-1); + } } target = args_get(args, 't'); -- cgit