comparison src/coding.c @ 45239:6a20d4c6bb78

(decode_coding) <coding_type_ccl>: If a lone CR characters is carried over from the previous block of text, adjust coding->produced to account for the extra character.

45238:193ea38d0029

      if (! (coding->mode & CODING_MODE_LAST_BLOCK)
	  && *(pend - 1) == '\r')
	{
	  /* If the last character is CR, we can't handle it here
	     because LF will be in the not-yet-decoded source text.
	     Recorded that the CR is not yet processed.  */
	  coding->spec.ccl.cr_carryover = 1;
	  coding->produced--;
	  coding->produced_char--;
	  pend--;
	}

decode_coding (coding, source, destination, src_bytes, dst_bytes)
     struct coding_system *coding;
     unsigned char *source, *destination;
     int src_bytes, dst_bytes;
{
  if (coding->type == coding_type_undecided)
    detect_coding (coding, source, src_bytes);

  if (coding->eol_type == CODING_EOL_UNDECIDED
      && coding->type != coding_type_ccl)

      break;

    case coding_type_ccl:
      if (coding->spec.ccl.cr_carryover)
	{
	  /* Set the CR which is not processed by the previous call of
	     decode_eol_post_ccl in DESTINATION.  */
	  *destination = '\r';
	  coding->produced++;
	  coding->produced_char++;
	  dst_bytes--;
	}
      ccl_coding_driver (coding, source,
			 destination + coding->spec.ccl.cr_carryover,
			 src_bytes, dst_bytes, 0);
      if (coding->eol_type != CODING_EOL_LF)
	decode_eol_post_ccl (coding, destination, coding->produced);
      break;

    default:
      decode_eol (coding, source, destination, src_bytes, dst_bytes);
    }

45239:6a20d4c6bb78

      if (! (coding->mode & CODING_MODE_LAST_BLOCK)
	  && *(pend - 1) == '\r')
	{
	  /* If the last character is CR, we can't handle it here
	     because LF will be in the not-yet-decoded source text.
	     Record that the CR is not yet processed.  */
	  coding->spec.ccl.cr_carryover = 1;
	  coding->produced--;
	  coding->produced_char--;
	  pend--;
	}

decode_coding (coding, source, destination, src_bytes, dst_bytes)
     struct coding_system *coding;
     unsigned char *source, *destination;
     int src_bytes, dst_bytes;
{
  int extra = 0;

  if (coding->type == coding_type_undecided)
    detect_coding (coding, source, src_bytes);

  if (coding->eol_type == CODING_EOL_UNDECIDED
      && coding->type != coding_type_ccl)

      break;

    case coding_type_ccl:
      if (coding->spec.ccl.cr_carryover)
	{
	  /* Put the CR which was not processed by the previous call
	     of decode_eol_post_ccl in DESTINATION.  It will be
	     decoded together with the following LF by the call to
	     decode_eol_post_ccl below.  */
	  *destination = '\r';
	  coding->produced++;
	  coding->produced_char++;
	  dst_bytes--;
	  extra = coding->spec.ccl.cr_carryover;
	}
      ccl_coding_driver (coding, source, destination + extra,
			 src_bytes, dst_bytes, 0);
      if (coding->eol_type != CODING_EOL_LF)
	{
	  coding->produced += extra;
	  coding->produced_char += extra;
	  decode_eol_post_ccl (coding, destination, coding->produced);
	}
      break;

    default:
      decode_eol (coding, source, destination, src_bytes, dst_bytes);
    }