norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pty: add env_reset property

Browse Source 
This property controls whether the environment should be reset before
spawning the child process. Defaults to "no" and affects whether "-p" is
passed as default argument to /bin/login.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-12-12 21:20:45 +01:00
parent d50f80a72f
commit dd481c2fa6
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/pty.c
View File

@ -63,6 +63,7 @@ struct kmscon_pty {
char *colorterm;
char **argv;
char *seat;
bool env_reset;
};
int kmscon_pty_new(struct kmscon_pty **out, kmscon_pty_input_cb input_cb,
@ -192,6 +193,14 @@ int kmscon_pty_set_seat(struct kmscon_pty *pty, const char *seat)
return 0;
}
void kmscon_pty_set_env_reset(struct kmscon_pty *pty, bool do_reset)
{
if (!pty)
return;
pty->env_reset = do_reset;
}
int kmscon_pty_get_fd(struct kmscon_pty *pty)
{
if (!pty)
@ -215,19 +224,39 @@ static bool pty_is_open(struct kmscon_pty *pty)
static void __attribute__((noreturn))
exec_child(const char *term, const char *colorterm, char **argv,
const char *seat)
const char *seat, bool env_reset)
{
char **env;
char **def_argv;
if (env_reset) {
env = malloc(sizeof(char*));
if (!env) {
log_error("cannot allocate memory for environment (%d): %m",
errno);
exit(EXIT_FAILURE);
}
memset(env, 0, sizeof(char*));
environ = env;
def_argv = (char*[]){ "/bin/login", "-p", NULL };
} else {
def_argv = (char*[]){ "/bin/login", NULL };
}
if (!term)
term = "vt220";
if (!argv)
argv = (char*[]){ "/bin/login", NULL };
argv = def_argv;
setenv("TERM", term, 1);
if (colorterm)
setenv("COLORTERM", colorterm, 1);
if (seat)
setenv("XDG_SEAT", seat, 1);
execvp(argv[0], argv);
execve(argv[0], argv, environ);
log_err("failed to exec child %s: %m", argv[0]);
@ -343,7 +372,8 @@ static int pty_spawn(struct kmscon_pty *pty, int master,
return -errno;
case 0:
setup_child(master, &ws);
exec_child(pty->term, pty->colorterm, pty->argv, pty->seat);
exec_child(pty->term, pty->colorterm, pty->argv, pty->seat,
pty->env_reset);
exit(EXIT_FAILURE);
default:
log_debug("forking child %d", pid);

2
src/pty.h
View File

@ -42,6 +42,7 @@
#ifndef KMSCON_PTY_H
#define KMSCON_PTY_H
#include <stdbool.h>
#include <stdlib.h>
struct kmscon_pty;
@ -57,6 +58,7 @@ int kmscon_pty_set_term(struct kmscon_pty *pty, const char *term);
int kmscon_pty_set_colorterm(struct kmscon_pty *pty, const char *colorterm);
int kmscon_pty_set_argv(struct kmscon_pty *pty, char **argv);
int kmscon_pty_set_seat(struct kmscon_pty *pty, const char *seat);
void kmscon_pty_set_env_reset(struct kmscon_pty *pty, bool do_reset);
int kmscon_pty_get_fd(struct kmscon_pty *pty);
void kmscon_pty_dispatch(struct kmscon_pty *pty);