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

Commit 75886f21 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: pty channel tidying 



Cleanup, mostly style violations.

Tidied the includes.

getmaster returns a real errno, which pty_open returns if there's a
problem.

The printks now have severity.

Changed os_* calls to call libc directly.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 63920f47

arch/um/drivers/pty.c

+40 −36
Original line number Diff line number Diff line 
/* 

 * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)

 * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 */
@@ -7,12 +7,14 @@ 
#include <stdlib.h>

#include <unistd.h>

#include <string.h>

#include <fcntl.h>

#include <errno.h>

#include <termios.h>

#include <sys/stat.h>

#include "chan_user.h"

#include "user.h"

#include "kern_util.h"

#include "os.h"

#include "user.h"

#include "kern_constants.h"

#include "um_malloc.h"



struct pty_chan {
@@ -28,11 +30,13 @@ static void *pty_chan_init(char *str, int device, const struct chan_opts *opts) 
	struct pty_chan *data;



	data = um_kmalloc(sizeof(*data));

	if(data == NULL) return(NULL);

	if (data == NULL)

		return NULL;



	*data = ((struct pty_chan) { .announce  	= opts->announce, 

				     .dev  		= device,

				     .raw  		= opts->raw });

	return(data);

	return data;

}



static int pts_open(int input, int output, int primary, void *d,
@@ -45,29 +49,33 @@ static int pts_open(int input, int output, int primary, void *d, 
	fd = get_pty();

	if (fd < 0) {

		err = -errno;

		printk("open_pts : Failed to open pts\n");

		printk(UM_KERN_ERR "open_pts : Failed to open pts\n");

		return err;

	}



	if (data->raw) {

		CATCH_EINTR(err = tcgetattr(fd, &data->tt));

		if (err)

			return(err);

			return err;



		err = raw(fd);

		if (err)

			return(err);

			return err;

	}



	dev = ptsname(fd);

	sprintf(data->dev_name, "%s", dev);

	*dev_out = data->dev_name;



	if (data->announce)

		(*data->announce)(dev, data->dev);

	return(fd);



	return fd;

}



static int getmaster(char *line)

{

	struct stat buf;

	char *pty, *bank, *cp;

	int master, err;
@@ -75,24 +83,29 @@ static int getmaster(char *line) 
	for (bank = "pqrs"; *bank; bank++) {

		line[strlen("/dev/pty")] = *bank;

		*pty = '0';

		if (os_stat_file(line, NULL) < 0)

		/* Did we hit the end ? */

		if ((stat(line, &buf) < 0) && (errno == ENOENT))

			break;



		for (cp = "0123456789abcdef"; *cp; cp++) {

			*pty = *cp;

			master = os_open_file(line, of_rdwr(OPENFLAGS()), 0);

			master = open(line, O_RDWR);

			if (master >= 0) {

				char *tp = &line[strlen("/dev/")];



				/* verify slave side is usable */

				*tp = 't';

				err = os_access(line, OS_ACC_RW_OK);

				err = access(line, R_OK | W_OK);

				*tp = 'p';

				if(err == 0) return(master);

				(void) os_close_file(master);

				if(!err)

					return master;

				close(master);

			}

		}

	}

	return(-1);



	printk(UM_KERN_ERR "getmaster - no usable host pty devices\n");

	return -ENOENT;

}



static int pty_open(int input, int output, int primary, void *d,
@@ -104,19 +117,21 @@ static int pty_open(int input, int output, int primary, void *d, 


	fd = getmaster(dev);

	if (fd < 0)

		return(-errno);

		return fd;



	if(data->raw){

		err = raw(fd);

		if (err)

			return(err);

			return err;

	}

	

	if(data->announce) (*data->announce)(dev, data->dev);

	if (data->announce)

		(*data->announce)(dev, data->dev);



	sprintf(data->dev_name, "%s", dev);

	*dev_out = data->dev_name;

	return(fd);



	return fd;

}



const struct chan_ops pty_ops = {
@@ -144,14 +159,3 @@ const struct chan_ops pts_ops = { 
	.free		= generic_free,

	.winch		= 0,

};
 


/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */