circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 1079: 

Accept an argument to show-environment to show one variable, based on a
diff from Kazuhiko Sakaguchi.
pull/1/head
Tiago Cunha 2012-03-29 21:10:10 +00:00
parent 407f66ccbc
commit faf51d748e
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd-show-environment.c
View File

@ -31,8 +31,8 @@ int cmd_show_environment_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_show_environment_entry = { const struct cmd_entry cmd_show_environment_entry = {
"show-environment", "showenv", "show-environment", "showenv",
"gt:", 0, 0, "gt:", 0, 1,
"[-g] " CMD_TARGET_SESSION_USAGE, "[-g] " CMD_TARGET_SESSION_USAGE " [name]",
0, 0,
NULL, NULL,
NULL, NULL,
@ -55,6 +55,19 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_ctx *ctx)
env = &s->environ; env = &s->environ;
} }
if (args->argc != 0) {
envent = environ_find(env, args->argv[0]);
if (envent == NULL) {
ctx->error(ctx, "unknown variable: %s", args->argv[0]);
return (-1);
}
if (envent->value != NULL)
ctx->print(ctx, "%s=%s", envent->name, envent->value);
else
ctx->print(ctx, "-%s", envent->name);
return (0);
}
RB_FOREACH(envent, environ, env) { RB_FOREACH(envent, environ, env) {
if (envent->value != NULL) if (envent->value != NULL)
ctx->print(ctx, "%s=%s", envent->name, envent->value); ctx->print(ctx, "%s=%s", envent->name, envent->value);

4
tmux.1
View File

@ -2912,12 +2912,16 @@ new process.
.It Xo Ic show-environment .It Xo Ic show-environment
.Op Fl g .Op Fl g
.Op Fl t Ar target-session .Op Fl t Ar target-session
.Op Ar variable
.Xc .Xc
.D1 (alias: Ic showenv ) .D1 (alias: Ic showenv )
Display the environment for Display the environment for
.Ar target-session .Ar target-session
or the global environment with or the global environment with
.Fl g . .Fl g .
If
.Ar variable
is omitted, all variables are shown.
Variables removed from the environment are prefixed with Variables removed from the environment are prefixed with
.Ql - . .Ql - .
.El .El