Tweak output of environment logging.

This commit is contained in:
nicm 2016-07-15 09:52:34 +00:00
parent 1718420c48
commit 9436a31603
3 changed files with 9 additions and 5 deletions

View File

@ -206,10 +206,14 @@ environ_push(struct environ *env)
/* Log the environment. */ /* Log the environment. */
void void
environ_log(struct environ *env) environ_log(struct environ *env, const char *prefix)
{ {
struct environ_entry *envent; struct environ_entry *envent;
RB_FOREACH(envent, environ, env) RB_FOREACH(envent, environ, env) {
log_debug("%s=%s", envent->name, envent->value); if (envent->value != NULL && *envent->name != '\0') {
log_debug("%s%s=%s", prefix, envent->name,
envent->value);
}
}
} }

2
tmux.h
View File

@ -1693,7 +1693,7 @@ void environ_put(struct environ *, const char *);
void environ_unset(struct environ *, const char *); void environ_unset(struct environ *, const char *);
void environ_update(const char *, struct environ *, struct environ *); void environ_update(const char *, struct environ *, struct environ *);
void environ_push(struct environ *); void environ_push(struct environ *);
void environ_log(struct environ *); void environ_log(struct environ *, const char *);
/* tty.c */ /* tty.c */
void tty_create_log(void); void tty_create_log(void);

View File

@ -842,7 +842,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
log_debug("spawn: %s -- %s", wp->shell, cmd); log_debug("spawn: %s -- %s", wp->shell, cmd);
for (i = 0; i < wp->argc; i++) for (i = 0; i < wp->argc; i++)
log_debug("spawn: argv[%d] = %s", i, wp->argv[i]); log_debug("spawn: argv[%d] = %s", i, wp->argv[i]);
environ_log(env); environ_log(env, "spawn: ");
memset(&ws, 0, sizeof ws); memset(&ws, 0, sizeof ws);
ws.ws_col = screen_size_x(&wp->base); ws.ws_col = screen_size_x(&wp->base);