vt: rearrange vc_translate_unicode (ede98d12) · Commits · 戴 / test

drivers/tty/vt/vt.c

+64 −57

Original line number	Diff line number	Diff line
		@@ -2572,6 +2572,19 @@ static inline int vc_translate_ascii(const struct vc_data *vc, int c)
		return c;
		}


		/**
		* vc_sanitize_unicode -- Replace invalid Unicode code points with U+FFFD
		* @c: the received character, or U+FFFD for invalid sequences.
		*/
		static inline int vc_sanitize_unicode(const int c)
		{
		if ((c >= 0xd800 && c <= 0xdfff) \|\| c == 0xfffe \|\| c == 0xffff)
		return 0xfffd;

		return c;
		}

		/**
		* vc_translate_unicode -- Combine UTF-8 into Unicode in @vc_utf_char
		*
		@@ -2586,34 +2599,39 @@ static int vc_translate_unicode(struct vc_data vc, int c, bool rescan)
		0x001fffff, 0x03ffffff, 0x7fffffff
		};

		if ((c & 0xc0) == 0x80) {
		/* Continuation byte received */
		if (vc->vc_utf_count) {
		if ((c & 0xc0) == 0x80) {
		/* Unexpected continuation byte? */
		if (!vc->vc_utf_count)
		return 0xfffd;

		vc->vc_utf_char = (vc->vc_utf_char << 6) \| (c & 0x3f);
		vc->vc_npar++;
		if (--vc->vc_utf_count) {
		/* Still need some bytes */
		return -1;
		}
		if (--vc->vc_utf_count)
		goto need_more_bytes;

		/* Got a whole character */
		c = vc->vc_utf_char;
		/* Reject overlong sequences */
		if (c <= utf8_length_changes[vc->vc_npar - 1] \|\|
		c > utf8_length_changes[vc->vc_npar])
		return 0xfffd;
		} else {
		/* Unexpected continuation byte */
		vc->vc_utf_count = 0;
		return 0xfffd;

		return vc_sanitize_unicode(c);
		}
		} else {

		/* Single ASCII byte or first byte of a sequence received */
		if (vc->vc_utf_count) {
		/* Continuation byte expected */
		*rescan = true;
		vc->vc_utf_count = 0;
		return 0xfffd;
		} else if (c > 0x7f) {
		}

		/* Nothing to do if an ASCII byte was received */
		if (c <= 0x7f)
		return c;

		/* First byte of a multibyte sequence received */
		vc->vc_npar = 0;
		if ((c & 0xe0) == 0xc0) {
		@@ -2635,20 +2653,9 @@ static int vc_translate_unicode(struct vc_data vc, int c, bool rescan)
		/* 254 and 255 are invalid */
		return 0xfffd;
		}
		if (vc->vc_utf_count) {
		/* Still need some bytes */
		return -1;
		}
		}
		/* Nothing to do if an ASCII byte was received */
		}
		/* End of UTF-8 decoding. */
		/* c is the received character, or U+FFFD for invalid sequences. */
		/* Replace invalid Unicode code points with U+FFFD too */
		if ((c >= 0xd800 && c <= 0xdfff) \|\| c == 0xfffe \|\| c == 0xffff)
		return 0xfffd;

		return c;
		need_more_bytes:
		return -1;
		}

		/* acquires console_lock */

Admin message