circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Move server_fill_environ into environ.c and move some other common code

Browse Source 
into it.
This commit is contained in:
nicm
2017-03-09 17:02:38 +00:00
parent e8f2609ca4
commit dbfee6a468
8 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd-respawn-pane.c
View File

@@ -65,11 +65,6 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
env = environ_create();
environ_copy(global_environ, env);
environ_copy(s->environ, env);
server_fill_environ(s, env);
window_pane_reset_mode(wp); window_pane_reset_mode(wp);
screen_reinit(&wp->base); screen_reinit(&wp->base);
input_init(wp); input_init(wp);
@@ -82,6 +77,7 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item)
if (envent != NULL) if (envent != NULL)
path = envent->value; path = envent->value;
env = environ_for_session(s);
if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, NULL, env, if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, NULL, env,
s->tio, &cause) != 0) { s->tio, &cause) != 0) {
cmdq_error(item, "respawn pane failed: %s", cause); cmdq_error(item, "respawn pane failed: %s", cause);
@@ -89,9 +85,10 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item)
environ_free(env); environ_free(env);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
environ_free(env);
wp->flags |= PANE_REDRAW; wp->flags |= PANE_REDRAW;
server_status_window(w); server_status_window(w);
environ_free(env);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }

8
cmd-respawn-window.c
View File

@@ -66,11 +66,6 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item)
} }
} }
env = environ_create();
environ_copy(global_environ, env);
environ_copy(s->environ, env);
server_fill_environ(s, env);
wp = TAILQ_FIRST(&w->panes); wp = TAILQ_FIRST(&w->panes);
TAILQ_REMOVE(&w->panes, wp, entry); TAILQ_REMOVE(&w->panes, wp, entry);
layout_free(w); layout_free(w);
@@ -86,6 +81,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item)
if (envent != NULL) if (envent != NULL)
path = envent->value; path = envent->value;
env = environ_for_session(s);
if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, NULL, env, if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, NULL, env,
s->tio, &cause) != 0) { s->tio, &cause) != 0) {
cmdq_error(item, "respawn window failed: %s", cause); cmdq_error(item, "respawn window failed: %s", cause);
@@ -94,6 +90,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item)
server_destroy_pane(wp, 0); server_destroy_pane(wp, 0);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
environ_free(env);
layout_init(w, wp); layout_init(w, wp);
window_pane_reset_mode(wp); window_pane_reset_mode(wp);
screen_reinit(&wp->base); screen_reinit(&wp->base);
@@ -103,6 +100,5 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item)
recalculate_sizes(); recalculate_sizes();
server_redraw_window(w); server_redraw_window(w);
environ_free(env);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }

14
cmd-split-window.c
View File

@@ -71,11 +71,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
server_unzoom_window(w); server_unzoom_window(w);
env = environ_create();
environ_copy(global_environ, env);
environ_copy(s->environ, env);
server_fill_environ(s, env);
if (args->argc == 0) { if (args->argc == 0) {
cmd = options_get_string(s->options, "default-command"); cmd = options_get_string(s->options, "default-command");
if (cmd != NULL && *cmd != '\0') { if (cmd != NULL && *cmd != '\0') {
@@ -148,9 +143,13 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
if (envent != NULL) if (envent != NULL)
path = envent->value; path = envent->value;
env = environ_for_session(s);
if (window_pane_spawn(new_wp, argc, argv, path, shell, cwd, env, if (window_pane_spawn(new_wp, argc, argv, path, shell, cwd, env,
s->tio, &cause) != 0) s->tio, &cause) != 0) {
environ_free(env);
goto error; goto error;
}
environ_free(env);
server_redraw_window(w); server_redraw_window(w);
@@ -161,8 +160,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
} else } else
server_status_session(s); server_status_session(s);
environ_free(env);
if (args_has(args, 'P')) { if (args_has(args, 'P')) {
if ((template = args_get(args, 'F')) == NULL) if ((template = args_get(args, 'F')) == NULL)
template = SPLIT_WINDOW_TEMPLATE; template = SPLIT_WINDOW_TEMPLATE;
@@ -186,7 +183,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
error: error:
environ_free(env);
if (new_wp != NULL) { if (new_wp != NULL) {
layout_close_pane(new_wp); layout_close_pane(new_wp);
window_remove_pane(w, new_wp); window_remove_pane(w, new_wp);

26
environ.c
View File

@@ -20,6 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include "tmux.h" #include "tmux.h"
@@ -218,3 +219,28 @@ environ_log(struct environ *env, const char *prefix)
} }
} }
} }
/* Create initial environment for new child. */
struct environ *
environ_for_session(struct session *s)
{
struct environ *env;
const char *value;
int idx;
env = environ_create();
environ_copy(global_environ, env);
if (s != NULL)
environ_copy(s->environ, env);
value = options_get_string(global_options, "default-terminal");
environ_set(env, "TERM", "%s", value);
if (s != NULL)
idx = s->id;
else
idx = -1;
environ_set(env, "TMUX", "%s,%ld,%d", socket_path, (long)getpid(), idx);
return (env);
}

7
job.c
View File

@@ -53,12 +53,7 @@ job_run(const char *cmd, struct session *s, const char *cwd,
if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, out) != 0) if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, out) != 0)
return (NULL); return (NULL);
env = environ_create(); env = environ_for_session(s);
environ_copy(global_environ, env);
if (s != NULL)
environ_copy(s->environ, env);
server_fill_environ(s, env);
switch (pid = fork()) { switch (pid = fork()) {
case -1: case -1:
environ_free(env); environ_free(env);

18
server-fn.c
View File

@@ -32,24 +32,6 @@ static struct session *server_next_session(struct session *);
static void server_callback_identify(int, short, void *); static void server_callback_identify(int, short, void *);
static void server_destroy_session_group(struct session *); static void server_destroy_session_group(struct session *);
void
server_fill_environ(struct session *s, struct environ *env)
{
const char *term;
u_int idx;
long pid;
if (s != NULL) {
term = options_get_string(global_options, "default-terminal");
environ_set(env, "TERM", "%s", term);
idx = s->id;
} else
idx = (u_int)-1;
pid = getpid();
environ_set(env, "TMUX", "%s,%ld,%u", socket_path, pid, idx);
}
void void
server_redraw_client(struct client *c) server_redraw_client(struct client *c)
{ {

8
session.c
View File

@@ -355,16 +355,12 @@ session_new(struct session *s, const char *name, int argc, char **argv,
} }
wl->session = s; wl->session = s;
env = environ_create();
environ_copy(global_environ, env);
environ_copy(s->environ, env);
server_fill_environ(s, env);
shell = options_get_string(s->options, "default-shell"); shell = options_get_string(s->options, "default-shell");
if (*shell == '\0' || areshell(shell)) if (*shell == '\0' || areshell(shell))
shell = _PATH_BSHELL; shell = _PATH_BSHELL;
hlimit = options_get_number(s->options, "history-limit"); hlimit = options_get_number(s->options, "history-limit");
env = environ_for_session(s);
w = window_create_spawn(name, argc, argv, path, shell, cwd, env, s->tio, w = window_create_spawn(name, argc, argv, path, shell, cwd, env, s->tio,
s->sx, s->sy, hlimit, cause); s->sx, s->sy, hlimit, cause);
if (w == NULL) { if (w == NULL) {
@@ -373,8 +369,8 @@ session_new(struct session *s, const char *name, int argc, char **argv,
return (NULL); return (NULL);
} }
winlink_set_window(wl, w); winlink_set_window(wl, w);
notify_session_window("window-linked", s, w);
environ_free(env); environ_free(env);
notify_session_window("window-linked", s, w);
session_group_synchronize_from(s); session_group_synchronize_from(s);
return (wl); return (wl);

2
tmux.h
View File

@@ -1613,6 +1613,7 @@ void environ_unset(struct environ *, const char *);
void environ_update(struct options *, struct environ *, struct environ *); void environ_update(struct options *, struct environ *, struct environ *);
void environ_push(struct environ *); void environ_push(struct environ *);
void environ_log(struct environ *, const char *); void environ_log(struct environ *, const char *);
struct environ *environ_for_session(struct session *);
/* tty.c */ /* tty.c */
void tty_create_log(void); void tty_create_log(void);
@@ -1838,7 +1839,6 @@ char *server_client_get_path(struct client *, const char *);
const char *server_client_get_cwd(struct client *); const char *server_client_get_cwd(struct client *);
/* server-fn.c */ /* server-fn.c */
void server_fill_environ(struct session *, struct environ *);
void server_redraw_client(struct client *); void server_redraw_client(struct client *);
void server_status_client(struct client *); void server_status_client(struct client *);
void server_redraw_session(struct session *); void server_redraw_session(struct session *);