upstream commit

Move several subprocess-related functions from various
locations to misc.c. Extend subprocess() to offer a little more control over
stdio disposition.

feedback & ok dtucker@

Upstream-ID: 3573dd7109d13ef9bd3bed93a3deb170fbfce049

1 files changed, 1 insertions, 60 deletions

diff --git a/session.c b/session.c
index 698eaa879..cd03fd423 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.290 2017/06/24 06:34:38 djm Exp $ */
+/* $OpenBSD: session.c,v 1.291 2017/08/18 05:36:45 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -825,65 +825,6 @@ check_quietlogin(Session *s, const char *command)
 }
 
 /*
- * Sets the value of the given variable in the environment.  If the variable
- * already exists, its value is overridden.
- */
-void
-child_set_env(char ***envp, u_int *envsizep, const char *name,
-        const char *value)
-{
-        char **env;
-        u_int envsize;
-        u_int i, namelen;
-
-        if (strchr(name, '=') != NULL) {
-                error("Invalid environment variable \"%.100s\"", name);
-                return;
-        }
-
-        /*
-         * If we're passed an uninitialized list, allocate a single null
-         * entry before continuing.
-         */
-        if (*envp == NULL && *envsizep == 0) {
-                *envp = xmalloc(sizeof(char *));
-                *envp[0] = NULL;
-                *envsizep = 1;
-        }
-
-        /*
-         * Find the slot where the value should be stored.  If the variable
-         * already exists, we reuse the slot; otherwise we append a new slot
-         * at the end of the array, expanding if necessary.
-         */
-        env = *envp;
-        namelen = strlen(name);
-        for (i = 0; env[i]; i++)
-                if (strncmp(env[i], name, namelen) == 0 && env[i][namelen] == '=')
-                        break;
-        if (env[i]) {
-                /* Reuse the slot. */
-                free(env[i]);
-        } else {
-                /* New variable.  Expand if necessary. */
-                envsize = *envsizep;
-                if (i >= envsize - 1) {
-                        if (envsize >= 1000)
-                                fatal("child_set_env: too many env vars");
-                        envsize += 50;
-                        env = (*envp) = xreallocarray(env, envsize, sizeof(char *));
-                        *envsizep = envsize;
-                }
-                /* Need to set the NULL pointer at end of array beyond the new slot. */
-                env[i + 1] = NULL;
-        }
-
-        /* Allocate space and format the variable in the appropriate slot. */
-        env[i] = xmalloc(strlen(name) + 1 + strlen(value) + 1);
-        snprintf(env[i], strlen(name) + 1 + strlen(value) + 1, "%s=%s", name, value);
-}
-
-/*
  * Reads environment variables from the given file and adds/overrides them
  * into the environment.  If the file does not exist, this does nothing.
  * Otherwise, it must consist of empty lines, comments (line starts with '#')