comparison src/callproc.c @ 83796:e7303426ed25

(Vinitial_environment): New variable. (set_initial_environment): Initialize it. (syms_of_callproc): Declare it. (child_setup): Don't mess with TERM via Qterm_environment_variable; the TERM under which a process runs is never related to the TERM in which Emacs is running.

83795:5ebc9b06e580

Lisp_Object Vconfigure_info_directory, Vshared_game_score_directory;
Lisp_Object Vtemp_file_name_pattern;

Lisp_Object Vshell_file_name;

Lisp_Object Vprocess_environment;

#ifdef DOS_NT
Lisp_Object Qbuffer_file_type;
#endif /* DOS_NT */

    char **p, **q;
    register int new_length;
    Lisp_Object local = selected_frame; /* get_frame_param (XFRAME (Fframe_with_environment (selected_frame)), */
/*                                          Qenvironment); */

    Lisp_Object term;
    Lisp_Object display;
    
    new_length = 0;

    for (tem = Vprocess_environment;

	 CONSP (tem) && STRINGP (XCAR (tem));
	 tem = XCDR (tem))
      new_length++;
#endif

    /* Add TERM and DISPLAY from the frame local values. */
    term = get_frame_param (XFRAME (local), Qterm_environment_variable);
    if (! NILP (term))
      new_length++;

    display = get_frame_param (XFRAME (local), Qdisplay_environment_variable);
    if (! NILP (display))
      new_length++;

    /* new_length + 2 to include PWD and terminating 0.  */
    env = new_env = (char **) alloca ((new_length + 2) * sizeof (char *));

    /* If we have a PWD envvar, pass one down,
       but with corrected value.  */
    if (egetenv ("PWD"))
      *new_env++ = pwd_var;
 
    if (! NILP (term))
      {
	int vlen = strlen ("TERM=") + strlen (SDATA (term)) + 1;
	char *vdata = (char *) alloca (vlen);
	strcpy (vdata, "TERM=");
	strcat (vdata, SDATA (term));
	new_env = add_env (env, new_env, vdata);
      }

    if (! NILP (display))
      {
	int vlen = strlen ("DISPLAY=") + strlen (SDATA (display)) + 1;
	char *vdata = (char *) alloca (vlen);
	strcpy (vdata, "DISPLAY=");
	strcat (vdata, SDATA (display));

    /* Overrides.  */
    for (tem = Vprocess_environment;
	 CONSP (tem) && STRINGP (XCAR (tem));
	 tem = XCDR (tem))
      {
	if ((strcmp (SDATA (XCAR (tem)), "TERM") != 0)
	    && (strcmp (SDATA (XCAR (tem)), "DISPLAY") != 0))
	  new_env = add_env (env, new_env, SDATA (XCAR (tem)));
      }

  
#if 0    

     Lisp_Object frame;
{
  Lisp_Object scan;
  Lisp_Object term;
  Lisp_Object display;
  

  if (NILP (frame))
    {
      /* Try to find VAR in Vprocess_environment first.  */
      for (scan = Vprocess_environment; CONSP (scan); scan = XCDR (scan))

      for (envp = environ; *envp; envp++)
	Vprocess_environment = Fcons (build_string (*envp),
				      Vprocess_environment);
      store_frame_param (SELECTED_FRAME(), Qenvironment, Vprocess_environment);
    }
}

void
syms_of_callproc ()
{

  DEFVAR_LISP ("temp-file-name-pattern", &Vtemp_file_name_pattern,
	       doc: /* Pattern for making names for temporary files.
This is used by `call-process-region'.  */);
  /* This variable is initialized in init_callproc.  */

  DEFVAR_LISP ("process-environment", &Vprocess_environment,
	       doc: /* List of overridden environment variables for subprocesses to inherit.
Each element should be a string of the form ENVVARNAME=VALUE.

Entries in this list take precedence to those in the frame-local

83796:e7303426ed25

Lisp_Object Vconfigure_info_directory, Vshared_game_score_directory;
Lisp_Object Vtemp_file_name_pattern;

Lisp_Object Vshell_file_name;

Lisp_Object Vprocess_environment, Vinitial_environment;

#ifdef DOS_NT
Lisp_Object Qbuffer_file_type;
#endif /* DOS_NT */

    char **p, **q;
    register int new_length;
    Lisp_Object local = selected_frame; /* get_frame_param (XFRAME (Fframe_with_environment (selected_frame)), */
/*                                          Qenvironment); */

    Lisp_Object display;
    
    new_length = 0;

    for (tem = Vprocess_environment;

	 CONSP (tem) && STRINGP (XCAR (tem));
	 tem = XCDR (tem))
      new_length++;
#endif

    /* Add DISPLAY from the frame local values. */
    display = get_frame_param (XFRAME (local), Qdisplay_environment_variable);
    if (! NILP (display))
      new_length++;

    /* new_length + 2 to include PWD and terminating 0.  */
    env = new_env = (char **) alloca ((new_length + 2) * sizeof (char *));
    /* If we have a PWD envvar, pass one down,
       but with corrected value.  */
    if (egetenv ("PWD"))
      *new_env++ = pwd_var;
 
    if (STRINGP (display))
      {
	int vlen = strlen ("DISPLAY=") + strlen (SDATA (display)) + 1;
	char *vdata = (char *) alloca (vlen);
	strcpy (vdata, "DISPLAY=");
	strcat (vdata, SDATA (display));

    /* Overrides.  */
    for (tem = Vprocess_environment;
	 CONSP (tem) && STRINGP (XCAR (tem));
	 tem = XCDR (tem))
      {
	if (strcmp (SDATA (XCAR (tem)), "DISPLAY") != 0)
	  new_env = add_env (env, new_env, SDATA (XCAR (tem)));
      }

  
#if 0    

     Lisp_Object frame;
{
  Lisp_Object scan;
  Lisp_Object term;
  Lisp_Object display;

  /* FIXME: Code duplication.  */

  if (NILP (frame))
    {
      /* Try to find VAR in Vprocess_environment first.  */
      for (scan = Vprocess_environment; CONSP (scan); scan = XCDR (scan))

      for (envp = environ; *envp; envp++)
	Vprocess_environment = Fcons (build_string (*envp),
				      Vprocess_environment);
      store_frame_param (SELECTED_FRAME(), Qenvironment, Vprocess_environment);
    }
  /* Ideally, the `copy' shouldn't be necessary, but it seems it's frequent
     to use `delete' and friends on process-environment.  */
  Vinitial_environment = Fcopy_sequence (Vprocess_environment);
}

void
syms_of_callproc ()
{

  DEFVAR_LISP ("temp-file-name-pattern", &Vtemp_file_name_pattern,
	       doc: /* Pattern for making names for temporary files.
This is used by `call-process-region'.  */);
  /* This variable is initialized in init_callproc.  */

  DEFVAR_LISP ("initial-environment", &Vinitial_environment,
	       doc: /* List of environment variables inherited from the parent process.
Each element should be a string of the form ENVVARNAME=VALUE.
The elements must normally be decoded (using `locale-coding-system') for use.  */);
  Vinitial_environment = Qnil;

  DEFVAR_LISP ("process-environment", &Vprocess_environment,
	       doc: /* List of overridden environment variables for subprocesses to inherit.
Each element should be a string of the form ENVVARNAME=VALUE.

Entries in this list take precedence to those in the frame-local