*/
char **pty_argv;
+char *pty_osx_envrestore_prefix;
+
static void pty_close(Pty pty);
static void pty_try_write(Pty pty);
* We are the child.
*/
+ if (pty_osx_envrestore_prefix) {
+ int plen = strlen(pty_osx_envrestore_prefix);
+ extern char **environ;
+ char **ep;
+
+ restart_osx_env_restore:
+ for (ep = environ; *ep; ep++) {
+ char *e = *ep;
+
+ if (!strncmp(e, pty_osx_envrestore_prefix, plen)) {
+ int unset = (e[plen] == 'u');
+ char *pname = dupprintf("%.*s", (int)strcspn(e, "="), e);
+ char *name = pname + plen + 1;
+ char *value = e + strcspn(e, "=");
+ if (*value) value++;
+ value = dupstr(value);
+ if (unset)
+ unsetenv(name);
+ else
+ setenv(name, value, 1);
+ unsetenv(pname);
+ sfree(pname);
+ sfree(value);
+ goto restart_osx_env_restore;
+ }
+ }
+ }
+
slavefd = pty_open_slave(pty);
if (slavefd < 0) {
perror("slave pty: open");
/*
* SIGINT, SIGQUIT and SIGPIPE may have been set to ignored by
* our parent, particularly by things like sh -c 'pterm &' and
- * some window or session managers. SIGCHLD, meanwhile, was
- * blocked during pt_main() startup. Reverse all this for our
- * child process.
+ * some window or session managers. SIGPIPE was also
+ * (potentially) blocked by us during startup. Reverse all
+ * this for our child process.
*/
putty_signal(SIGINT, SIG_DFL);
putty_signal(SIGQUIT, SIG_DFL);
putty_signal(SIGPIPE, SIG_DFL);
- block_signal(SIGCHLD, 0);
+ block_signal(SIGPIPE, 0);
if (pty_argv) {
/*
* Exec the exact argument list we were given.