version 1.54, 2012/05/21 18:27:42 |
version 1.55, 2012/05/25 08:28:10 |
|
|
if (shell_cmd == NULL && environ_path != NULL && |
if (shell_cmd == NULL && environ_path != NULL && |
(cmdflags & CMD_CANTNEST) && |
(cmdflags & CMD_CANTNEST) && |
strcmp(socket_path, environ_path) == 0) { |
strcmp(socket_path, environ_path) == 0) { |
log_warnx("sessions should be nested with care. " |
fprintf(stderr, "sessions should be nested with care, " |
"unset $TMUX to force."); |
"unset $TMUX to force\n"); |
return (1); |
return (1); |
} |
} |
|
|
/* Initialise the client socket and start the server. */ |
/* Initialise the client socket and start the server. */ |
fd = client_connect(socket_path, cmdflags & CMD_STARTSERVER); |
fd = client_connect(socket_path, cmdflags & CMD_STARTSERVER); |
if (fd == -1) { |
if (fd == -1) { |
log_warn("failed to connect to server"); |
fprintf(stderr, "failed to connect to server\n"); |
return (1); |
return (1); |
} |
} |
|
|
|
|
cmddata.argc = argc; |
cmddata.argc = argc; |
if (cmd_pack_argv( |
if (cmd_pack_argv( |
argc, argv, cmddata.argv, sizeof cmddata.argv) != 0) { |
argc, argv, cmddata.argv, sizeof cmddata.argv) != 0) { |
log_warnx("command too long"); |
fprintf(stderr, "command too long\n"); |
return (1); |
return (1); |
} |
} |
|
|
|
|
return (0); |
return (0); |
datalen = imsg.hdr.len - IMSG_HEADER_SIZE; |
datalen = imsg.hdr.len - IMSG_HEADER_SIZE; |
|
|
log_debug("client got %d", imsg.hdr.type); |
log_debug("got %d from server", imsg.hdr.type); |
switch (imsg.hdr.type) { |
switch (imsg.hdr.type) { |
case MSG_DETACHKILL: |
case MSG_DETACHKILL: |
case MSG_DETACH: |
case MSG_DETACH: |