Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b033e1f authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: add mconsole_reply variant with length param 



This is needed for the console output patch, since we have a possibly
non-NULL-terminated string there.  So, the new interface takes a string and a
length, and the old interface calls strlen on its string and calls the new
interface with the length.

There's also a bit of whitespace cleanup.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 44700a44

arch/um/drivers/mconsole_user.c

+9 −3
Original line number Diff line number Diff line
@@ -122,12 +122,12 @@ int mconsole_get_request(int fd, struct mc_request *req) 
	return(1);

}



int mconsole_reply(struct mc_request *req, char *str, int err, int more)

int mconsole_reply_len(struct mc_request *req, const char *str, int total,

		       int err, int more)

{

	struct mconsole_reply reply;

	int total, len, n;

	int len, n;



	total = strlen(str);

	do {

		reply.err = err;
@@ -155,6 +155,12 @@ int mconsole_reply(struct mc_request *req, char *str, int err, int more) 
	return(0);

}



int mconsole_reply(struct mc_request *req, const char *str, int err, int more)

{

	return mconsole_reply_len(req, str, strlen(str), err, more);

}





int mconsole_unlink_socket(void)

{

	unlink(mconsole_socket_name);

arch/um/include/mconsole.h

+5 −3
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ struct mc_request 
extern char mconsole_socket_name[];



extern int mconsole_unlink_socket(void);

extern int mconsole_reply(struct mc_request *req, char *reply, int err,

extern int mconsole_reply_len(struct mc_request *req, const char *reply,

			      int len, int err, int more);

extern int mconsole_reply(struct mc_request *req, const char *str, int err,

			  int more);



extern void mconsole_version(struct mc_request *req);