circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Allow -c anywhere -s was allowed.

Browse Source
This commit is contained in:
Nicholas Marriott
2008-06-03 16:55:09 +00:00
parent 3e6b145923
commit 743956edf8
13 changed files with 339 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmd-rename-window.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-rename-window.c,v 1.17 2008-06-03 05:35:51 nicm Exp $ */
/* $Id: cmd-rename-window.c,v 1.18 2008-06-03 16:55:09 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -34,6 +34,7 @@ void cmd_rename_window_recv(void **, struct buffer *);
void cmd_rename_window_free(void *);
struct cmd_rename_window_data {
char *cname;
char *sname;
int idx;
char *newname;
@ -41,7 +42,7 @@ struct cmd_rename_window_data {
const struct cmd_entry cmd_rename_window_entry = {
"rename-window", "renamew",
"[-i index] [-s session-name] new-name",
"[-c client-tty|-s session-name] [-i index] new-name",
0,
cmd_rename_window_parse,
cmd_rename_window_exec,
@ -60,12 +61,19 @@ cmd_rename_window_parse(
int opt;
*ptr = data = xmalloc(sizeof *data);
data->cname = NULL;
data->sname = NULL;
data->idx = -1;
data->newname = NULL;
while ((opt = getopt(argc, argv, "i:s:")) != EOF) {
while ((opt = getopt(argc, argv, "c:i:s:")) != EOF) {
switch (opt) {
case 'c':
if (data->sname != NULL)
goto usage;
if (data->cname == NULL)
data->cname = xstrdup(optarg);
break;
case 'i':
data->idx = strtonum(optarg, 0, INT_MAX, &errstr);
if (errstr != NULL) {
@ -74,7 +82,10 @@ cmd_rename_window_parse(
}
break;
case 's':
data->sname = xstrdup(optarg);
if (data->cname != NULL)
goto usage;
if (data->sname == NULL)
data->sname = xstrdup(optarg);
break;
default:
goto usage;
@ -107,7 +118,7 @@ cmd_rename_window_exec(void *ptr, struct cmd_ctx *ctx)
if (data == NULL)
return;
if ((s = cmd_find_session(ctx, data->sname)) == NULL)
if ((s = cmd_find_session(ctx, data->cname, data->sname)) == NULL)
return;
if (data->idx == -1)
@ -131,6 +142,7 @@ cmd_rename_window_send(void *ptr, struct buffer *b)
struct cmd_rename_window_data *data = ptr;
buffer_write(b, data, sizeof *data);
cmd_send_string(b, data->cname);
cmd_send_string(b, data->sname);
cmd_send_string(b, data->newname);
}
@ -142,6 +154,7 @@ cmd_rename_window_recv(void **ptr, struct buffer *b)
*ptr = data = xmalloc(sizeof *data);
buffer_read(b, data, sizeof *data);
data->cname = cmd_recv_string(b);
data->sname = cmd_recv_string(b);
data->newname = cmd_recv_string(b);
}
@ -151,6 +164,8 @@ cmd_rename_window_free(void *ptr)
{
struct cmd_rename_window_data *data = ptr;
if (data->cname != NULL)
xfree(data->cname);
if (data->sname != NULL)
xfree(data->sname);
if (data->newname != NULL)