comparison src/fileio.c @ 20651:0de9f45a1db6

(Finsert_file_contents): When not decoding, properly calculate number of chars in the text. Fix error message. (file_name_as_directory): Error if arg is empty. (Fwrite_region): Don't flush the encoding buffer if failure is set.

20650:427fa7757472

char *
file_name_as_directory (out, in)
     char *out, *in;
{
  int size = strlen (in) - 1;

  strcpy (out, in);

#ifdef VMS
  /* Is it already a directory string? */

	 so don't bother counting in HOW_MUCH.
	 (INSERTED is where we count the number of characters inserted.)  */
      if (! not_regular)
	how_much += this;

      this_chars = this;
      if (CODING_REQUIRE_DECODING (&coding)
	  || CODING_REQUIRE_DETECTION (&coding))
	{
	  int require, produced, consumed;

	  bcopy (read_buf + consumed, read_buf, unprocessed);
	  this = produced;
	  this_chars = chars_in_text (BYTE_POS_ADDR (PT_BYTE + inserted - 1) + 1,
				      produced);
	}

      GAP_SIZE -= this;
      GPT_BYTE += this;
      ZV_BYTE += this;
      Z_BYTE += this;

  if (how_much == -1)
    error ("IO error reading %s: %s",
	   XSTRING (orig_filename)->data, strerror (errno));
  else if (how_much == -2)
    error ("maximum buffer size exceeded");

  set_coding_system = 1;

 notfound:
 handled:

      coding.last_block = 1;
      failure = 0 > a_write (desc, "", 0, XINT (start), &annotations, &coding);
      save_errno = errno;
    }

  if (CODING_REQUIRE_FLUSHING (&coding) && !coding.last_block)
    {
      /* We have to flush out a data. */
      coding.last_block = 1;
      failure = 0 > e_write (desc, "", 0, &coding);
      save_errno = errno;

20651:0de9f45a1db6

char *
file_name_as_directory (out, in)
     char *out, *in;
{
  int size = strlen (in) - 1;

  if (size < 0)
    error ("Empty file name");

  strcpy (out, in);

#ifdef VMS
  /* Is it already a directory string? */

	 so don't bother counting in HOW_MUCH.
	 (INSERTED is where we count the number of characters inserted.)  */
      if (! not_regular)
	how_much += this;

      if (CODING_REQUIRE_DECODING (&coding)
	  || CODING_REQUIRE_DETECTION (&coding))
	{
	  int require, produced, consumed;

	  bcopy (read_buf + consumed, read_buf, unprocessed);
	  this = produced;
	  this_chars = chars_in_text (BYTE_POS_ADDR (PT_BYTE + inserted - 1) + 1,
				      produced);
	}
      else if (! NILP (current_buffer->enable_multibyte_characters))
	this_chars = chars_in_text (BYTE_POS_ADDR (PT_BYTE + inserted - 1) + 1,
				    this);
      else
	this_chars = this;

      GAP_SIZE -= this;
      GPT_BYTE += this;
      ZV_BYTE += this;
      Z_BYTE += this;

  if (how_much == -1)
    error ("IO error reading %s: %s",
	   XSTRING (orig_filename)->data, strerror (errno));
  else if (how_much == -2)
    error ("Maximum buffer size exceeded");

  set_coding_system = 1;

 notfound:
 handled:

      coding.last_block = 1;
      failure = 0 > a_write (desc, "", 0, XINT (start), &annotations, &coding);
      save_errno = errno;
    }

  if (CODING_REQUIRE_FLUSHING (&coding) && !coding.last_block
      && ! failure)
    {
      /* We have to flush out a data. */
      coding.last_block = 1;
      failure = 0 > e_write (desc, "", 0, &coding);
      save_errno = errno;