comparison src/callproc.c @ 26838:27b6d3367b47

(Fcall_process): Call code_convert_string to encode arguments. Use CODING_REQUIRE_DECODING to check if the process output should be decoded.

26837:bb9ada50010f

  new_argv[0] = XSTRING (path)->data;
  if (nargs > 4)
    {
      register int i;

      if (! CODING_REQUIRE_ENCODING (&argument_coding))
	{
	  for (i = 4; i < nargs; i++)
	    new_argv[i - 3] = XSTRING (args[i])->data;
	}
      else
	{
	  /* We must encode the arguments.  */
	  struct gcpro gcpro1, gcpro2, gcpro3;

	  GCPRO3 (infile, buffer, current_dir);
	  for (i = 4; i < nargs; i++)
	    {
	      int size = encoding_buffer_size (&argument_coding,
					       STRING_BYTES (XSTRING (args[i])));
	      unsigned char *dummy1 = (unsigned char *) alloca (size);

	      /* The Irix 4.0 compiler barfs if we eliminate dummy.  */
	      new_argv[i - 3] = dummy1;
	      argument_coding.mode |= CODING_MODE_LAST_BLOCK;
	      encode_coding (&argument_coding,
			     XSTRING (args[i])->data,
			     new_argv[i - 3],
			     STRING_BYTES (XSTRING (args[i])),
			     size);
	      new_argv[i - 3][argument_coding.produced] = 0;
	      /* We have to initialize CCL program status again.  */
	      if (argument_coding.type == coding_type_ccl)
		setup_ccl_program (&(argument_coding.spec.ccl.encoder), Qnil);
	    }
	  UNGCPRO;
	}
      new_argv[nargs - 3] = 0;
    }
  else
    new_argv[1] = 0;

	/* Now NREAD is the total amount of data in the buffer.  */
	immediate_quit = 0;
	
	if (!NILP (buffer))
	  {
	    if (process_coding.type == coding_type_no_conversion)
	      insert (bufptr, nread);
	    else
	      {			/* We have to decode the input.  */
		int size = decoding_buffer_size (&process_coding, nread);
		char *decoding_buf = (char *) xmalloc (size);

	immediate_quit = 1;
	QUIT;
      }
  give_up: ;

  Vlast_coding_system_used = process_coding.symbol;

  /* If the caller required, let the buffer inherit the
     coding-system used to decode the process output.  */
  if (inherit_process_coding_system)
    call1 (intern ("after-insert-file-set-buffer-file-coding-system"),
	   make_number (total_read));
  }

  /* Wait for it to terminate, unless it already has.  */
  wait_for_termination (pid);

26838:27b6d3367b47

  new_argv[0] = XSTRING (path)->data;
  if (nargs > 4)
    {
      register int i;

      if (CODING_REQUIRE_ENCODING (&argument_coding))
	{
	  /* We must encode the arguments.  */
	  struct gcpro gcpro1, gcpro2, gcpro3;

	  GCPRO3 (infile, buffer, current_dir);
	  for (i = 4; i < nargs; i++)
	    {
	      args[i] = code_convert_string (args[i], &argument_coding, 1, 0);
	      setup_ccl_program (&(argument_coding.spec.ccl.encoder), Qnil);
	    }
	  UNGCPRO;
	}
      for (i = 4; i < nargs; i++)
	new_argv[i - 3] = XSTRING (args[i])->data;
      new_argv[nargs - 3] = 0;
    }
  else
    new_argv[1] = 0;

	/* Now NREAD is the total amount of data in the buffer.  */
	immediate_quit = 0;
	
	if (!NILP (buffer))
	  {
	    if (! CODING_REQUIRE_DECODING (&process_coding))
	      insert (bufptr, nread);
	    else
	      {			/* We have to decode the input.  */
		int size = decoding_buffer_size (&process_coding, nread);
		char *decoding_buf = (char *) xmalloc (size);

	immediate_quit = 1;
	QUIT;
      }
  give_up: ;

    Vlast_coding_system_used = process_coding.symbol;

    /* If the caller required, let the buffer inherit the
       coding-system used to decode the process output.  */
    if (inherit_process_coding_system)
      call1 (intern ("after-insert-file-set-buffer-file-coding-system"),
	     make_number (total_read));
  }

  /* Wait for it to terminate, unless it already has.  */
  wait_for_termination (pid);