Pass $TERM to emulated process

zerocc2014 · Apr 6, 2018 · 20dac20 · 20dac20
1 parent fb2c5a2
commit 20dac20
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/main.c b/main.c
@@ -4,7 +4,10 @@
 #include "xX_main_Xx.h"
 
 int main(int argc, char *const argv[]) {
-    int err = xX_main_Xx(argc, argv);
+    char *const *envp = NULL;
+    if (getenv("TERM"))
+        envp = (char *[]) {getenv("TERM") - strlen("TERM") - 1, NULL};
+    int err = xX_main_Xx(argc, argv, envp);
     if (err < 0) {
         fprintf(stderr, "%s\n", strerror(-err));
         return err;

diff --git a/tools/ptraceomatic.c b/tools/ptraceomatic.c
@@ -432,7 +432,7 @@ static void prepare_tracee(int pid) {
 }
 
 int main(int argc, char *const argv[]) {
-    int err = xX_main_Xx(argc, argv);
+    int err = xX_main_Xx(argc, argv, NULL);
     if (err < 0) {
         fprintf(stderr, "%s\n", strerror(-err));
         return err;

diff --git a/xX_main_Xx.h b/xX_main_Xx.h
@@ -13,7 +13,7 @@ static void exit_handler(int code) {
 // this function parses command line arguments and initializes global
 // data structures. thanks programming discussions discord server for the name.
 // https://discord.gg/9zT7NHP
-static inline int xX_main_Xx(int argc, char *const argv[]) {
+static inline int xX_main_Xx(int argc, char *const argv[], char *const *envp) {
     // parse cli options
     int opt;
     const char *root = "";
@@ -50,7 +50,9 @@ static inline int xX_main_Xx(int argc, char *const argv[]) {
         fs_chdir(current->fs, pwd);
     }
 
-    err = sys_execve(argv[optind], argv + optind, (char *[]) {NULL});
+    if (envp == NULL)
+        envp = (char *[]) {NULL};
+    err = sys_execve(argv[optind], argv + optind, envp);
     if (err < 0)
         return err;
     err = create_stdio(real_tty_driver);