diff options
| author |   nicm <nicm@openbsd.org> | 2009-08-08 21:52:43 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2009-08-08 21:52:43 +0000 |
| commit | 6f7d62ebc9d2569213457966b9dab344dd30c124 (patch) | |
| tree | db1575bc7a8f723d64cf32fa11b69f42b628e4dd /usr.bin/tmux/client.c | |
| parent | Tidy function a little by using a temporary variable. (diff) | |
| download | wireguard-openbsd-6f7d62ebc9d2569213457966b9dab344dd30c124.tar.xz wireguard-openbsd-6f7d62ebc9d2569213457966b9dab344dd30c124.zip | |
Infrastructure and commands to manage the environment for processes started
within tmux.
There is a global environment, copied from the external environment when the
server is started and each sesssion has an (initially empty) session
environment which overrides it.
New commands set-environment and show-environment manipulate or display the
environments.
A new session option, update-environment, is a space-separated list of
variables which are updated from the external environment into the session
environment every time a new session is created - the default is DISPLAY.
Diffstat (limited to 'usr.bin/tmux/client.c')
| -rw-r--r-- | usr.bin/tmux/client.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index dbe96613bd7..295e9b02ac7 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.10 2009/08/08 21:18:23 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.11 2009/08/08 21:52:43 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -33,6 +33,7 @@ #include "tmux.h" +void client_send_environ(struct client_ctx *); void client_handle_winch(struct client_ctx *); int @@ -95,6 +96,8 @@ server_started: cctx->srv_in = buffer_create(BUFSIZ); cctx->srv_out = buffer_create(BUFSIZ); + if (cmdflags & CMD_SENDENVIRON) + client_send_environ(cctx); if (isatty(STDIN_FILENO)) { if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) == -1) fatal("ioctl(TIOCGWINSZ)"); @@ -133,6 +136,19 @@ not_found: return (1); } +void +client_send_environ(struct client_ctx *cctx) +{ + char **var; + struct msg_environ_data data; + + for (var = environ; *var != NULL; var++) { + if (strlcpy(data.var, *var, sizeof data.var) >= sizeof data.var) + continue; + client_write_server(cctx, MSG_ENVIRON, &data, sizeof data); + } +} + int client_main(struct client_ctx *cctx) { @@ -242,8 +258,8 @@ client_msg_dispatch(struct client_ctx *cctx) if (hdr.size != sizeof printdata) fatalx("bad MSG_PRINT size"); buffer_read(cctx->srv_in, &printdata, sizeof printdata); - printdata.msg[(sizeof printdata.msg) - 1] = '\0'; + printdata.msg[(sizeof printdata.msg) - 1] = '\0'; cctx->errstr = xstrdup(printdata.msg); return (-1); case MSG_EXIT: |