diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
| commit | a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a (patch) | |
| tree | ebfcd8a38514651c4657dac40601a5aafa360b89 /cmd-show-environment.c | |
| parent | da1f6fc2c8477c99e986061bcdd7c3e854a60076 (diff) | |
| parent | bf9c933caed5c74be3c9c4da02d7c57a9dcf091d (diff) | |
| download | rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.gz rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.bz2 rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-show-environment.c')
| -rw-r--r-- | cmd-show-environment.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmd-show-environment.c b/cmd-show-environment.c index af24d91b..96cfa289 100644 --- a/cmd-show-environment.c +++ b/cmd-show-environment.c @@ -91,12 +91,12 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq) struct environ_entry *envent; if (args_has(self->args, 'g')) - env = &global_environ; + env = global_environ; else { s = cmd_find_session(cmdq, args_get(args, 't'), 0); if (s == NULL) return (CMD_RETURN_ERROR); - env = &s->environ; + env = s->environ; } if (args->argc != 0) { @@ -109,7 +109,10 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_NORMAL); } - RB_FOREACH(envent, environ, env) + envent = environ_first(env); + while (envent != NULL) { cmd_show_environment_print(self, cmdq, envent); + envent = environ_next(envent); + } return (CMD_RETURN_NORMAL); } |