circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-16 01:18:52 +00:00
Code Issues Projects Releases Wiki Activity

|PatchSet 884

Browse Source 
|Date: 2011/04/06 22:51:31
|Author: nicm
|Branch: HEAD
|Tag: (none)
|Log:
|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.
This commit is contained in:
Nicholas Marriott 2011-04-06 22:29:26 +00:00
parent 13c54a04a0
commit e5f4bf3f3e
5 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd-new-session.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-new-session.c,v 1.85 2011-04-06 22:24:00 nicm Exp $ */ /* $Id: cmd-new-session.c,v 1.86 2011-04-06 22:29:26 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -68,9 +68,15 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
u_int sx, sy, i; u_int sx, sy, i;
newname = args_get(args, 's'); newname = args_get(args, 's');
if (newname != NULL && session_find(newname) != NULL) { if (newname != NULL) {
ctx->error(ctx, "duplicate session: %s", newname); if (!session_check_name(newname)) {
return (-1); 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'); target = args_get(args, 't');

6
cmd-rename-session.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-rename-session.c,v 1.23 2011-04-06 22:24:01 nicm Exp $ */ /* $Id: cmd-rename-session.c,v 1.24 2011-04-06 22:29:26 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -46,6 +46,10 @@ cmd_rename_session_exec(struct cmd *self, struct cmd_ctx *ctx)
const char *newname; const char *newname;
newname = args->argv[0]; newname = args->argv[0];
if (!session_check_name(newname)) {
ctx->error(ctx, "bad session name: %s", newname);
return (-1);
}
if (session_find(newname) != NULL) { if (session_find(newname) != NULL) {
ctx->error(ctx, "duplicate session: %s", newname); ctx->error(ctx, "duplicate session: %s", newname);
return (-1); return (-1);

12
cmd.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd.c,v 1.151 2011-04-06 22:24:01 nicm Exp $ */ /* $Id: cmd.c,v 1.152 2011-04-06 22:29:26 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -724,6 +724,12 @@ cmd_find_session(struct cmd_ctx *ctx, const char *arg, int prefer_unattached)
if (arglen != 0 && tmparg[arglen - 1] == ':') if (arglen != 0 && tmparg[arglen - 1] == ':')
tmparg[arglen - 1] = '\0'; tmparg[arglen - 1] = '\0';
/* An empty session name is the current session. */
if (*tmparg == '\0') {
xfree (tmparg);
return (cmd_current_session(ctx, prefer_unattached));
}
/* Find the session, if any. */ /* Find the session, if any. */
s = cmd_lookup_session(tmparg, &ambiguous); s = cmd_lookup_session(tmparg, &ambiguous);
@ -839,7 +845,7 @@ no_colon:
lookup_session: lookup_session:
if (ambiguous) if (ambiguous)
goto not_found; goto not_found;
if ((s = cmd_lookup_session(arg, &ambiguous)) == NULL) if (*arg != '\0' && (s = cmd_lookup_session(arg, &ambiguous)) == NULL)
goto no_session; goto no_session;
if (sp != NULL) if (sp != NULL)
@ -980,7 +986,7 @@ no_colon:
lookup_session: lookup_session:
if (ambiguous) if (ambiguous)
goto not_found; goto not_found;
if ((s = cmd_lookup_session(arg, &ambiguous)) == NULL) if (*arg != '\0' && (s = cmd_lookup_session(arg, &ambiguous)) == NULL)
goto no_session; goto no_session;
if (sp != NULL) if (sp != NULL)

9
session.c
View File

@ -1,4 +1,4 @@
/* $Id: session.c,v 1.88 2011-02-15 15:09:52 tcunha Exp $ */ /* $Id: session.c,v 1.89 2011-04-06 22:29:26 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -163,6 +163,13 @@ session_destroy(struct session *s)
RB_INSERT(sessions, &dead_sessions, s); RB_INSERT(sessions, &dead_sessions, s);
} }
/* Check a session name is valid: not empty and no colons. */
int
session_check_name(const char *name)
{
return (*name != '\0' && strchr(name, ':') == NULL);
}
/* Update session active time. */ /* Update session active time. */
void void
session_update_activity(struct session *s) session_update_activity(struct session *s)

3
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.617 2011-04-06 22:24:01 nicm Exp $ */ /* $Id: tmux.h,v 1.618 2011-04-06 22:29:26 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1974,6 +1974,7 @@ struct session *session_create(const char *, const char *, const char *,
struct environ *, struct termios *, int, u_int, u_int, struct environ *, struct termios *, int, u_int, u_int,
char **); char **);
void session_destroy(struct session *); void session_destroy(struct session *);
int session_check_name(const char *);
void session_update_activity(struct session *); void session_update_activity(struct session *);
struct session *session_next_session(struct session *); struct session *session_next_session(struct session *);
struct session *session_previous_session(struct session *); struct session *session_previous_session(struct session *);