git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5-vs2.0.2.2-rc4 patched with stable patch...
[linux-2.6.git]
/
arch
/
um
/
drivers
/
pty.c
diff --git
a/arch/um/drivers/pty.c
b/arch/um/drivers/pty.c
index
d674171
..
1c555c3
100644
(file)
--- a/
arch/um/drivers/pty.c
+++ b/
arch/um/drivers/pty.c
@@
-22,7
+22,7
@@
struct pty_chan {
char dev_name[sizeof("/dev/pts/0123456\0")];
};
char dev_name[sizeof("/dev/pts/0123456\0")];
};
-void *pty_chan_init(char *str, int device, struct chan_opts *opts)
+
static
void *pty_chan_init(char *str, int device, struct chan_opts *opts)
{
struct pty_chan *data;
{
struct pty_chan *data;
@@
-34,7
+34,8
@@
void *pty_chan_init(char *str, int device, struct chan_opts *opts)
return(data);
}
return(data);
}
-int pts_open(int input, int output, int primary, void *d, char **dev_out)
+static int pts_open(int input, int output, int primary, void *d,
+ char **dev_out)
{
struct pty_chan *data = d;
char *dev;
{
struct pty_chan *data = d;
char *dev;
@@
-42,8
+43,9
@@
int pts_open(int input, int output, int primary, void *d, char **dev_out)
fd = get_pty();
if(fd < 0){
fd = get_pty();
if(fd < 0){
+ err = -errno;
printk("open_pts : Failed to open pts\n");
printk("open_pts : Failed to open pts\n");
- return
(-errno)
;
+ return
err
;
}
if(data->raw){
CATCH_EINTR(err = tcgetattr(fd, &data->tt));
}
if(data->raw){
CATCH_EINTR(err = tcgetattr(fd, &data->tt));
@@
-58,11
+60,12
@@
int pts_open(int input, int output, int primary, void *d, char **dev_out)
dev = ptsname(fd);
sprintf(data->dev_name, "%s", dev);
*dev_out = data->dev_name;
dev = ptsname(fd);
sprintf(data->dev_name, "%s", dev);
*dev_out = data->dev_name;
- if(data->announce) (*data->announce)(dev, data->dev);
+ if (data->announce)
+ (*data->announce)(dev, data->dev);
return(fd);
}
return(fd);
}
-int getmaster(char *line)
+
static
int getmaster(char *line)
{
char *pty, *bank, *cp;
int master, err;
{
char *pty, *bank, *cp;
int master, err;
@@
-91,16
+94,17
@@
int getmaster(char *line)
return(-1);
}
return(-1);
}
-int pty_open(int input, int output, int primary, void *d, char **dev_out)
+static int pty_open(int input, int output, int primary, void *d,
+ char **dev_out)
{
struct pty_chan *data = d;
int fd, err;
char dev[sizeof("/dev/ptyxx\0")] = "/dev/ptyxx";
fd = getmaster(dev);
{
struct pty_chan *data = d;
int fd, err;
char dev[sizeof("/dev/ptyxx\0")] = "/dev/ptyxx";
fd = getmaster(dev);
- if(fd < 0)
+ if(fd < 0)
return(-errno);
return(-errno);
-
+
if(data->raw){
err = raw(fd);
if(err)
if(data->raw){
err = raw(fd);
if(err)
@@
-114,13
+118,6
@@
int pty_open(int input, int output, int primary, void *d, char **dev_out)
return(fd);
}
return(fd);
}
-int pty_console_write(int fd, const char *buf, int n, void *d)
-{
- struct pty_chan *data = d;
-
- return(generic_console_write(fd, buf, n, &data->tt));
-}
-
struct chan_ops pty_ops = {
.type = "pty",
.init = pty_chan_init,
struct chan_ops pty_ops = {
.type = "pty",
.init = pty_chan_init,
@@
-128,7
+125,7
@@
struct chan_ops pty_ops = {
.close = generic_close,
.read = generic_read,
.write = generic_write,
.close = generic_close,
.read = generic_read,
.write = generic_write,
- .console_write =
pty
_console_write,
+ .console_write =
generic
_console_write,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,
@@
-141,7
+138,7
@@
struct chan_ops pts_ops = {
.close = generic_close,
.read = generic_read,
.write = generic_write,
.close = generic_close,
.read = generic_read,
.write = generic_write,
- .console_write =
pty
_console_write,
+ .console_write =
generic
_console_write,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,