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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
um
/
drivers
/
pty.c
diff --git
a/arch/um/drivers/pty.c
b/arch/um/drivers/pty.c
index
0274053
..
829a5ec
100644
(file)
--- a/
arch/um/drivers/pty.c
+++ b/
arch/um/drivers/pty.c
@@
-7,12
+7,13
@@
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <fcntl.h>
#include <termios.h>
#include "chan_user.h"
#include "user.h"
#include "user_util.h"
#include "kern_util.h"
#include <termios.h>
#include "chan_user.h"
#include "user.h"
#include "user_util.h"
#include "kern_util.h"
+#include "os.h"
+#include "um_malloc.h"
struct pty_chan {
void (*announce)(char *dev_name, int dev);
struct pty_chan {
void (*announce)(char *dev_name, int dev);
@@
-22,80
+23,95
@@
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, const
struct chan_opts *opts)
{
struct pty_chan *data;
{
struct pty_chan *data;
- if((data = um_kmalloc(sizeof(*data))) == NULL) return(NULL);
+ data = um_kmalloc(sizeof(*data));
+ if(data == NULL) return(NULL);
*data = ((struct pty_chan) { .announce = opts->announce,
.dev = device,
.raw = opts->raw });
return(data);
}
*data = ((struct pty_chan) { .announce = opts->announce,
.dev = device,
.raw = opts->raw });
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;
- int fd;
+ int fd
, err
;
- if((fd = get_pty()) < 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){
}
if(data->raw){
- tcgetattr(fd, &data->tt);
- raw(fd, 0);
+ CATCH_EINTR(err = tcgetattr(fd, &data->tt));
+ if(err)
+ return(err);
+
+ err = raw(fd);
+ if(err)
+ return(err);
}
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)
{
{
- struct stat stb;
char *pty, *bank, *cp;
char *pty, *bank, *cp;
- int master;
+ int master
, err
;
pty = &line[strlen("/dev/ptyp")];
for (bank = "pqrs"; *bank; bank++) {
line[strlen("/dev/pty")] = *bank;
*pty = '0';
pty = &line[strlen("/dev/ptyp")];
for (bank = "pqrs"; *bank; bank++) {
line[strlen("/dev/pty")] = *bank;
*pty = '0';
- if (
stat(line, &stb
) < 0)
+ if (
os_stat_file(line, NULL
) < 0)
break;
for (cp = "0123456789abcdef"; *cp; cp++) {
*pty = *cp;
break;
for (cp = "0123456789abcdef"; *cp; cp++) {
*pty = *cp;
- master = o
pen(line, O_RDWR
);
+ master = o
s_open_file(line, of_rdwr(OPENFLAGS()), 0
);
if (master >= 0) {
char *tp = &line[strlen("/dev/")];
if (master >= 0) {
char *tp = &line[strlen("/dev/")];
- int ok;
/* verify slave side is usable */
*tp = 't';
/* verify slave side is usable */
*tp = 't';
-
ok = access(line, R_OK|W_OK) == 0
;
+
err = os_access(line, OS_ACC_RW_OK)
;
*tp = 'p';
*tp = 'p';
- if
(ok
) return(master);
- (void)
clos
e(master);
+ if
(err == 0
) return(master);
+ (void)
os_close_fil
e(master);
}
}
}
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;
{
struct pty_chan *data = d;
- int fd;
+ int fd
, err
;
char dev[sizeof("/dev/ptyxx\0")] = "/dev/ptyxx";
fd = getmaster(dev);
char dev[sizeof("/dev/ptyxx\0")] = "/dev/ptyxx";
fd = getmaster(dev);
- if(fd < 0) return(-errno);
+ if(fd < 0)
+ return(-errno);
+
+ if(data->raw){
+ err = raw(fd);
+ if(err)
+ return(err);
+ }
- if(data->raw) raw(fd, 0);
if(data->announce) (*data->announce)(dev, data->dev);
sprintf(data->dev_name, "%s", dev);
if(data->announce) (*data->announce)(dev, data->dev);
sprintf(data->dev_name, "%s", dev);
@@
-103,34
+119,27
@@
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 = {
+const struct chan_ops pty_ops = {
.type = "pty",
.init = pty_chan_init,
.open = pty_open,
.close = generic_close,
.read = generic_read,
.write = generic_write,
.type = "pty",
.init = pty_chan_init,
.open = pty_open,
.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,
};
-struct chan_ops pts_ops = {
+
const
struct chan_ops pts_ops = {
.type = "pts",
.init = pty_chan_init,
.open = pts_open,
.close = generic_close,
.read = generic_read,
.write = generic_write,
.type = "pts",
.init = pty_chan_init,
.open = pts_open,
.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,