Commit 5a52baaa authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

vc_screen: extract vcs_read_buf_noattr 



Now, move the code for no-attributes handling to a separate function.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200818085706.12163-13-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f66eee3

drivers/tty/vt/vc_screen.c

+22 −11
Original line number Diff line number Diff line
@@ -277,6 +277,26 @@ static int vcs_read_buf_uni(struct vc_data *vc, char *con_buf, 
	return 0;

}



static void vcs_read_buf_noattr(const struct vc_data *vc, char *con_buf,

		unsigned int pos, unsigned int count, bool viewed)

{

	u16 *org;

	unsigned int col, maxcol = vc->vc_cols;



	org = screen_pos(vc, pos, viewed);

	col = pos % maxcol;

	pos += maxcol - col;



	while (count-- > 0) {

		*con_buf++ = (vcs_scr_readw(vc, org++) & 0xff);

		if (++col == maxcol) {

			org = screen_pos(vc, pos, viewed);

			col = 0;

			pos += maxcol;

		}

	}

}



static ssize_t

vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)

{
@@ -359,17 +379,8 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) 
			if (ret)

				break;

		} else if (!attr) {

			org = screen_pos(vc, p, viewed);

			col = p % maxcol;

			p += maxcol - col;

			while (this_round-- > 0) {

				*con_buf0++ = (vcs_scr_readw(vc, org++) & 0xff);

				if (++col == maxcol) {

					org = screen_pos(vc, p, viewed);

					col = 0;

					p += maxcol;

				}

			}

			vcs_read_buf_noattr(vc, con_buf, pos, this_round,

					viewed);

		} else {

			if (p < HEADER_SIZE) {

				/* clamp header values if they don't fit */

CRA Git | Maintained and supported by SUSTech CRA and CCSE