mirror of
https://github.com/tmate-io/tmate.git
synced 2024-12-21 06:10:56 +01:00
1f5e6e35d5
Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
142 lines
3.4 KiB
C
142 lines
3.4 KiB
C
/* $Id$ */
|
|
|
|
/*
|
|
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
|
|
* Copyright (c) 2009 Nicholas Marriott <nicm@openbsd.org>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
|
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "tmux.h"
|
|
|
|
/*
|
|
* Runs a command without a window.
|
|
*/
|
|
|
|
enum cmd_retval cmd_run_shell_exec(struct cmd *, struct cmd_ctx *);
|
|
void cmd_run_shell_callback(struct job *);
|
|
void cmd_run_shell_free(void *);
|
|
|
|
const struct cmd_entry cmd_run_shell_entry = {
|
|
"run-shell", "run",
|
|
"", 1, 1,
|
|
"command",
|
|
0,
|
|
NULL,
|
|
NULL,
|
|
cmd_run_shell_exec
|
|
};
|
|
|
|
struct cmd_run_shell_data {
|
|
char *cmd;
|
|
struct cmd_ctx ctx;
|
|
};
|
|
|
|
enum cmd_retval
|
|
cmd_run_shell_exec(struct cmd *self, struct cmd_ctx *ctx)
|
|
{
|
|
struct args *args = self->args;
|
|
struct cmd_run_shell_data *cdata;
|
|
const char *shellcmd = args->argv[0];
|
|
|
|
cdata = xmalloc(sizeof *cdata);
|
|
cdata->cmd = xstrdup(args->argv[0]);
|
|
memcpy(&cdata->ctx, ctx, sizeof cdata->ctx);
|
|
|
|
if (ctx->cmdclient != NULL)
|
|
ctx->cmdclient->references++;
|
|
if (ctx->curclient != NULL)
|
|
ctx->curclient->references++;
|
|
|
|
job_run(shellcmd, cmd_run_shell_callback, cmd_run_shell_free, cdata);
|
|
|
|
return (CMD_RETURN_YIELD); /* don't let client exit */
|
|
}
|
|
|
|
void
|
|
cmd_run_shell_callback(struct job *job)
|
|
{
|
|
struct cmd_run_shell_data *cdata = job->data;
|
|
struct cmd_ctx *ctx = &cdata->ctx;
|
|
char *cmd, *msg, *line;
|
|
size_t size;
|
|
int retcode;
|
|
u_int lines;
|
|
|
|
if (ctx->cmdclient != NULL && ctx->cmdclient->flags & CLIENT_DEAD)
|
|
return;
|
|
if (ctx->curclient != NULL && ctx->curclient->flags & CLIENT_DEAD)
|
|
return;
|
|
|
|
lines = 0;
|
|
do {
|
|
if ((line = evbuffer_readline(job->event->input)) != NULL) {
|
|
ctx->print(ctx, "%s", line);
|
|
lines++;
|
|
}
|
|
} while (line != NULL);
|
|
|
|
size = EVBUFFER_LENGTH(job->event->input);
|
|
if (size != 0) {
|
|
line = xmalloc(size + 1);
|
|
memcpy(line, EVBUFFER_DATA(job->event->input), size);
|
|
line[size] = '\0';
|
|
|
|
ctx->print(ctx, "%s", line);
|
|
lines++;
|
|
|
|
free(line);
|
|
}
|
|
|
|
cmd = cdata->cmd;
|
|
|
|
msg = NULL;
|
|
if (WIFEXITED(job->status)) {
|
|
if ((retcode = WEXITSTATUS(job->status)) != 0)
|
|
xasprintf(&msg, "'%s' returned %d", cmd, retcode);
|
|
} else if (WIFSIGNALED(job->status)) {
|
|
retcode = WTERMSIG(job->status);
|
|
xasprintf(&msg, "'%s' terminated by signal %d", cmd, retcode);
|
|
}
|
|
if (msg != NULL) {
|
|
if (lines != 0)
|
|
ctx->print(ctx, "%s", msg);
|
|
else
|
|
ctx->info(ctx, "%s", msg);
|
|
free(msg);
|
|
}
|
|
}
|
|
|
|
void
|
|
cmd_run_shell_free(void *data)
|
|
{
|
|
struct cmd_run_shell_data *cdata = data;
|
|
struct cmd_ctx *ctx = &cdata->ctx;
|
|
|
|
if (ctx->cmdclient != NULL) {
|
|
ctx->cmdclient->references--;
|
|
ctx->cmdclient->flags |= CLIENT_EXIT;
|
|
}
|
|
if (ctx->curclient != NULL)
|
|
ctx->curclient->references--;
|
|
|
|
free(cdata->cmd);
|
|
free(cdata);
|
|
}
|